diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-09-30 08:09:21 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-10-28 11:42:18 +0200 |
| commit | c733f89eaf0c6bf70ab35666a4ef38490abca828 (patch) | |
| tree | e2276e44d3fc43124032a23cebd86c5d945f1b74 /src/process | |
| parent | de15db17eccbc42d5d867973e7af3b95debff186 (diff) | |
Fix setup for 'no-prefix' builds
QT_SUPERBUILD is never cached and user can run
only qtbase as super build and compile any other
module as separate module build, moreover this can be
also 'no prefix' build.
Fix missing checks to support that case and clean up
install of resources.
For mac framework builds copy bundle to right place
in case of 'no-prefix' builds.
Fixes: QTBUG-94604
Task-number: QTBUG-96375
Pick-to: 6.2
Change-Id: I4ab7d4fed2c2be93f2a048a510419849361883ba
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/process')
| -rw-r--r-- | src/process/CMakeLists.txt | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt index 8d146aa61..8628500c0 100644 --- a/src/process/CMakeLists.txt +++ b/src/process/CMakeLists.txt @@ -44,12 +44,14 @@ qt_get_cmake_configurations(configs) foreach(config ${configs}) string(TOUPPER "${config}" config_upper) set_target_properties(${qtWebEngineProcessName} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_${config_upper} "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}") + RUNTIME_OUTPUT_DIRECTORY_${config_upper} "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}" + ) endforeach() if(QT_FEATURE_debug_and_release) set_target_properties(${qtWebEngineProcessName} PROPERTIES - OUTPUT_NAME_DEBUG ${qtWebEngineProcessName}${CMAKE_DEBUG_POSTFIX}) + OUTPUT_NAME_DEBUG ${qtWebEngineProcessName}${CMAKE_DEBUG_POSTFIX} + ) endif() if(isFramework) @@ -70,10 +72,17 @@ if(isFramework) USES_TERMINAL ) install(TARGETS ${qtWebEngineProcessName} - BUNDLE DESTINATION ./lib/QtWebEngineCore.framework/Versions/A/Helpers + BUNDLE DESTINATION "${INSTALL_LIBDIR}/QtWebEngineCore.framework/Versions/A/Helpers" COMPONENT Runtime ) - qt_enable_separate_debug_info(${qtWebEngineProcessName} ./lib/QtWebEngineCore.framework/Versions/A/Helpers QT_EXECUTABLE) + if(QT_SUPERBUILD OR NOT QT_WILL_INSTALL) + addCopyDirCommand(${qtWebEngineProcessName} "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${qtWebEngineProcessName}.app" + "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/QtWebEngineCore.framework/Versions/A/Helpers/${qtWebEngineProcessName}.app/" + ) + endif() + qt_enable_separate_debug_info(${qtWebEngineProcessName} + "${INSTALL_LIBDIR}/QtWebEngineCore.framework/Versions/A/Helpers" QT_EXECUTABLE + ) else() qt_apply_rpaths(TARGET ${qtWebEngineProcessName} INSTALL_PATH "${INSTALL_LIBEXECDIR}" RELATIVE_RPATH) install(TARGETS ${qtWebEngineProcessName} |