diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-29 19:29:35 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-02 18:38:17 +0000 |
| commit | d12f5800dee57402d23c22ce4d9e34aeae66fa33 (patch) | |
| tree | 55ed1a52c501124f7e8a0eea60aa947e77e02339 /src | |
| parent | 73487b82471e41e5c6950ac17c5dd5915cd92cf4 (diff) | |
Fix build with system ICU library
Change-Id: Ic4c3a0f2a187d25c92b76e06f9c5764cafc1e5a9
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit fa11a593ee0b263335dbb1d4212bf3c7604f0643)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 1b4e4930e..58cf9c48b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -668,11 +668,14 @@ foreach(res ${resourceList}) list(APPEND resourceFiles ${resSourcePath}) endforeach() -get_filename_component(icuFiles ${buildDir}/${config}/icudtl.dat REALPATH) +if (NOT QT_FEATURE_webengine_system_icu) + get_filename_component(icuFile ${buildDir}/${config}/icudtl.dat REALPATH) + list(APPEND resourceFiles ${icuFile}) +endif() if(QT_FEATURE_framework) - set(allResourceFiles ${localeFiles} ${resourceFiles} ${icuFiles}) - target_sources(WebEngineCore PRIVATE ${icuFiles} ${resourceFiles} ${localeFiles}) + set(allResourceFiles ${localeFiles} ${resourceFiles}) + target_sources(WebEngineCore PRIVATE ${allResourceFiles}) set_source_files_properties(${localeFiles} TARGET_DIRECTORY WebEngineCore @@ -684,17 +687,9 @@ if(QT_FEATURE_framework) PROPERTIES MACOSX_PACKAGE_LOCATION Resources GENERATED TRUE ) - set_source_files_properties(${icuFiles} - TARGET_DIRECTORY WebEngineCore - PROPERTIES MACOSX_PACKAGE_LOCATION Resources - GENERATED TRUE - ) - add_custom_command(OUTPUT ${localeFiles} ${resourceFiles} ${icuFiles} - DEPENDS ${buildDir}/${config}/QtWebEngineCore.stamp - ) - add_custom_target(generate_resources_${config} - DEPENDS ${localeFiles} ${resourcesFiles} ${icuFiles} - ) + + add_custom_command(OUTPUT ${allResourceFiles} DEPENDS ${buildDir}/${config}/QtWebEngineCore.stamp) + add_custom_target(generate_resources_${config} DEPENDS ${allResourceFiles}) else() install(FILES ${localeFiles} DESTINATION translations/qtwebengine_locales @@ -704,10 +699,6 @@ else() DESTINATION resources CONFIGURATIONS ${config} ) - install(FILES ${icuFiles} - DESTINATION resources - CONFIGURATIONS ${config} - ) # install (again) for superbuild install(FILES ${localeFiles} DESTINATION ${WEBENGINE_ROOT_BUILD_DIR}/translations/qtwebengine_locales @@ -717,10 +708,6 @@ else() DESTINATION ${WEBENGINE_ROOT_BUILD_DIR}/resources CONFIGURATIONS ${config} ) - install(FILES ${icuFiles} - DESTINATION ${WEBENGINE_ROOT_BUILD_DIR}/resources - CONFIGURATIONS ${config} - ) if(NOT QT_WILL_INSTALL) # TODO: Could we get rid of ALL? add_custom_target( @@ -730,7 +717,7 @@ else() COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_PREFIX}/resources COMMAND ${CMAKE_COMMAND} -E copy - ${resourceFiles} ${icuFiles} + ${resourceFiles} ${CMAKE_INSTALL_PREFIX}/resources) add_custom_target( install_locales_${config} |