diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-02-12 08:24:50 +0100 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-02-12 09:30:05 +0000 |
| commit | eed49de35b63fe120bbea0019b0e6cd62b5f3a8c (patch) | |
| tree | 4b85b0e4e6303b0058f03bd1333930374e7c8cd8 /cmake | |
| parent | 6a23f644dceb48d36efe70b6a1e02df386ba7128 (diff) | |
CMake Build: Use install component Dependencies
Fixes: QTCREATORBUG-23593
Change-Id: If9861a0ee09f2ce12ac093c2fde600a77958723a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 96625d0a12..46d49a1690 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -6,10 +6,7 @@ # # This way we are sure that all the binaries have been installed before. -option(DEPLOY_QTC_DEPENDENCIES - "Deployment of Qt, Clang, C++ Runtime libraries" ON) - -if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND DEPLOY_QTC_DEPENDENCIES) +if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16) get_target_property(moc_binary Qt5::moc IMPORTED_LOCATION) get_filename_component(moc_dir "${moc_binary}" DIRECTORY) get_filename_component(QT_BASE_DIR "${moc_dir}/../" ABSOLUTE) @@ -28,6 +25,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND DEPLOY_QTC_DEPENDENCIES) install( DIRECTORY "${QT_BASE_DIR}/plugins/${plugin}" DESTINATION ${QT_DEST_PLUGIN_PATH} + COMPONENT Dependencies ${exclusion_mask} ) list(APPEND QT_PLUGIN_DIRECTORIES "${QT_DEST_PLUGIN_PATH}/${plugin}") @@ -36,6 +34,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND DEPLOY_QTC_DEPENDENCIES) install( DIRECTORY "${QT_BASE_DIR}/qml/" DESTINATION ${QT_DEST_QML_PATH} + COMPONENT Dependencies PATTERN "qml/*" ${exclusion_mask} ) @@ -43,7 +42,10 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND DEPLOY_QTC_DEPENDENCIES) # Analyze the binaries and install missing dependencies if they are # found the CMAKE_PREFIX_PATH e.g. Qt, Clang configure_file(InstallDependentSharedObjects.cmake.in InstallDependentSharedObjects.cmake @ONLY) - install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/InstallDependentSharedObjects.cmake) + install( + SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/InstallDependentSharedObjects.cmake + COMPONENT Dependencies + ) if (MSVC) set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP ON) @@ -51,6 +53,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND DEPLOY_QTC_DEPENDENCIES) install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${IDE_APP_PATH} + COMPONENT Dependencies ) endif() endif() diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 902ccc02d0..8ca2a4f27f 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -1045,6 +1045,7 @@ function(add_qtc_executable name) create_qt_conf(\"${_EXECUTABLE_PATH}\" \"${IDE_LIBRARY_BASE_PATH}/Qt\") endif() " + COMPONENT Dependencies ) endif() |