diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-12-06 13:04:17 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-12-07 18:39:54 +0200 |
| commit | 49f6b0146a520e61477aacdf8d1f4e7048f569dd (patch) | |
| tree | 1bc5b9a7f72bfe25b70109190b018c6549403813 /cmake | |
| parent | 3c41b91d44838fcadfa50c4044e338d43a27cc10 (diff) | |
| parent | 9eed77fe86ed91b08d4f9dc23d3534eeb3dfff6a (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/mcusupport/mcusupportrunconfiguration.cpp
src/plugins/python/pythonproject.cpp
src/plugins/qmakeprojectmanager/qmakestep.cpp
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 27e6cfd7ab..f7caec76ed 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -491,16 +491,18 @@ function(add_qtc_library name) install(TARGETS ${name} EXPORT ${IDE_CASED_ID} - RUNTIME DESTINATION "${_DESTINATION}" + RUNTIME DESTINATION "${_DESTINATION}" OPTIONAL LIBRARY DESTINATION "${IDE_LIBRARY_PATH}" ${NAMELINK_OPTION} + OPTIONAL OBJECTS DESTINATION "${IDE_LIBRARY_PATH}" COMPONENT Devel EXCLUDE_FROM_ALL ARCHIVE DESTINATION "${IDE_LIBRARY_PATH}" COMPONENT Devel EXCLUDE_FROM_ALL + OPTIONAL ) if (NAMELINK_OPTION) @@ -509,6 +511,7 @@ function(add_qtc_library name) DESTINATION "${IDE_LIBRARY_PATH}" NAMELINK_ONLY COMPONENT Devel EXCLUDE_FROM_ALL + OPTIONAL ) endif() @@ -703,11 +706,12 @@ function(add_qtc_plugin target_name) if (NOT _arg_SKIP_INSTALL) install(TARGETS ${target_name} EXPORT ${IDE_CASED_ID} - RUNTIME DESTINATION "${plugin_dir}" - LIBRARY DESTINATION "${plugin_dir}" + RUNTIME DESTINATION "${plugin_dir}" OPTIONAL + LIBRARY DESTINATION "${plugin_dir}" OPTIONAL ARCHIVE DESTINATION "${plugin_dir}" COMPONENT Devel EXCLUDE_FROM_ALL + OPTIONAL ) endif() endfunction() @@ -857,7 +861,7 @@ function(add_qtc_executable name) enable_pch(${name}) if (NOT _arg_SKIP_INSTALL) - install(TARGETS ${name} DESTINATION "${_DESTINATION}") + install(TARGETS ${name} DESTINATION "${_DESTINATION}" OPTIONAL) endif() endfunction() |