diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2019-12-03 14:15:55 +0100 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2019-12-03 15:00:37 +0000 |
| commit | ba31c5d554215a3ab8f84a1e71fcbbfbb41cc179 (patch) | |
| tree | 32f8faf81d38e2fd31e8c0a7fe1abc73c629c8df | |
| parent | ce95e31766e441698486fea0258e16395c829c80 (diff) | |
| download | qt-creator-ba31c5d554215a3ab8f84a1e71fcbbfbb41cc179.tar.gz | |
CMake Build: do not fail to install on missing targets
The install target will install all targets that what have been built.
If some plugin is not being built (all Clang* plugins) by not having
the necesssary dependencies, it's not a failure not to have that plugin
at installation time.
Change-Id: I78b71a3fcae462d3eae7520744bfebab3f924bb4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -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 41c9867bef..d4268085a7 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -484,16 +484,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) @@ -502,6 +504,7 @@ function(add_qtc_library name) DESTINATION "${IDE_LIBRARY_PATH}" NAMELINK_ONLY COMPONENT Devel EXCLUDE_FROM_ALL + OPTIONAL ) endif() @@ -696,11 +699,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() @@ -850,7 +854,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() |