forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -484,16 +484,18 @@ function(add_qtc_library name)
|
|||||||
|
|
||||||
install(TARGETS ${name}
|
install(TARGETS ${name}
|
||||||
EXPORT ${IDE_CASED_ID}
|
EXPORT ${IDE_CASED_ID}
|
||||||
RUNTIME DESTINATION "${_DESTINATION}"
|
RUNTIME DESTINATION "${_DESTINATION}" OPTIONAL
|
||||||
LIBRARY
|
LIBRARY
|
||||||
DESTINATION "${IDE_LIBRARY_PATH}"
|
DESTINATION "${IDE_LIBRARY_PATH}"
|
||||||
${NAMELINK_OPTION}
|
${NAMELINK_OPTION}
|
||||||
|
OPTIONAL
|
||||||
OBJECTS
|
OBJECTS
|
||||||
DESTINATION "${IDE_LIBRARY_PATH}"
|
DESTINATION "${IDE_LIBRARY_PATH}"
|
||||||
COMPONENT Devel EXCLUDE_FROM_ALL
|
COMPONENT Devel EXCLUDE_FROM_ALL
|
||||||
ARCHIVE
|
ARCHIVE
|
||||||
DESTINATION "${IDE_LIBRARY_PATH}"
|
DESTINATION "${IDE_LIBRARY_PATH}"
|
||||||
COMPONENT Devel EXCLUDE_FROM_ALL
|
COMPONENT Devel EXCLUDE_FROM_ALL
|
||||||
|
OPTIONAL
|
||||||
)
|
)
|
||||||
|
|
||||||
if (NAMELINK_OPTION)
|
if (NAMELINK_OPTION)
|
||||||
@@ -502,6 +504,7 @@ function(add_qtc_library name)
|
|||||||
DESTINATION "${IDE_LIBRARY_PATH}"
|
DESTINATION "${IDE_LIBRARY_PATH}"
|
||||||
NAMELINK_ONLY
|
NAMELINK_ONLY
|
||||||
COMPONENT Devel EXCLUDE_FROM_ALL
|
COMPONENT Devel EXCLUDE_FROM_ALL
|
||||||
|
OPTIONAL
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -696,11 +699,12 @@ function(add_qtc_plugin target_name)
|
|||||||
if (NOT _arg_SKIP_INSTALL)
|
if (NOT _arg_SKIP_INSTALL)
|
||||||
install(TARGETS ${target_name}
|
install(TARGETS ${target_name}
|
||||||
EXPORT ${IDE_CASED_ID}
|
EXPORT ${IDE_CASED_ID}
|
||||||
RUNTIME DESTINATION "${plugin_dir}"
|
RUNTIME DESTINATION "${plugin_dir}" OPTIONAL
|
||||||
LIBRARY DESTINATION "${plugin_dir}"
|
LIBRARY DESTINATION "${plugin_dir}" OPTIONAL
|
||||||
ARCHIVE
|
ARCHIVE
|
||||||
DESTINATION "${plugin_dir}"
|
DESTINATION "${plugin_dir}"
|
||||||
COMPONENT Devel EXCLUDE_FROM_ALL
|
COMPONENT Devel EXCLUDE_FROM_ALL
|
||||||
|
OPTIONAL
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
@@ -850,7 +854,7 @@ function(add_qtc_executable name)
|
|||||||
enable_pch(${name})
|
enable_pch(${name})
|
||||||
|
|
||||||
if (NOT _arg_SKIP_INSTALL)
|
if (NOT _arg_SKIP_INSTALL)
|
||||||
install(TARGETS ${name} DESTINATION "${_DESTINATION}")
|
install(TARGETS ${name} DESTINATION "${_DESTINATION}" OPTIONAL)
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user