diff options
| -rw-r--r-- | src/core/api/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/process/CMakeLists.txt | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt index ffc450039..803cd43c9 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt @@ -141,6 +141,14 @@ if(QT_FEATURE_framework) add_custom_command(OUTPUT ${allResourceFiles} DEPENDS ${buildDir}/${config}/${arch}/QtWebEngineCore.stamp) add_custom_target(generate_resources_${config} DEPENDS ${allResourceFiles}) + + addCopyCommand(WebEngineCore "${localeFiles}" + "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/QtWebEngineCore.framework/Versions/A/Resources/qtwebengine_locales/" + ) + addCopyCommand(WebEngineCore "${resourceFiles}" + "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/QtWebEngineCore.framework/Versions/A/Resources/" + ) + else() install(FILES ${localeFiles} DESTINATION ${INSTALL_TRANSLATIONSDIR}/qtwebengine_locales diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt index 8628500c0..7054cac79 100644 --- a/src/process/CMakeLists.txt +++ b/src/process/CMakeLists.txt @@ -41,10 +41,18 @@ qt_internal_extend_target(${qtWebEngineProcessName} target_include_directories(${qtWebEngineProcessName} PRIVATE ../core) qt_get_cmake_configurations(configs) + foreach(config ${configs}) string(TOUPPER "${config}" config_upper) + if(isFramework) + set(outputPath + "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/QtWebEngineCore.framework/Versions/A/Helpers" + ) + else() + set(outputPath "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}") + endif() set_target_properties(${qtWebEngineProcessName} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_${config_upper} "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}" + RUNTIME_OUTPUT_DIRECTORY_${config_upper} "${outputPath}" ) endforeach() @@ -75,11 +83,6 @@ if(isFramework) BUNDLE DESTINATION "${INSTALL_LIBDIR}/QtWebEngineCore.framework/Versions/A/Helpers" COMPONENT Runtime ) - 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 ) |