diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/webenginewidgets/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/webenginewidgets/spellchecker/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/auto/widgets/spellchecking/CMakeLists.txt | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f80888064..c78610c2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,5 +22,5 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Gui Widgets Network OpenGL OpenGLWidgets Quick Qml PrintSupport WebChannel Positioning QuickControls2 Test QuickWidgets QuickTest WebSockets ) - +set(WEBENGINE_MODULE_BUILD TRUE) qt_build_repo() diff --git a/examples/webenginewidgets/CMakeLists.txt b/examples/webenginewidgets/CMakeLists.txt index 651a01344..a0dc6330d 100644 --- a/examples/webenginewidgets/CMakeLists.txt +++ b/examples/webenginewidgets/CMakeLists.txt @@ -16,6 +16,7 @@ if(QT_FEATURE_webengine_printing_and_pdf) add_subdirectory(printme) add_subdirectory(html2pdf) endif() -if(QT_FEATURE_webengine_spellchecker AND NOT CMAKE_CROSSCOMPILING AND NOT QT_FEATURE_webengine_native_spellchecker) +if(QT_FEATURE_webengine_spellchecker AND NOT CMAKE_CROSSCOMPILING + AND NOT QT_FEATURE_webengine_native_spellchecker AND NOT WIN32) add_subdirectory(spellchecker) endif() diff --git a/examples/webenginewidgets/spellchecker/CMakeLists.txt b/examples/webenginewidgets/spellchecker/CMakeLists.txt index f05cd74fe..5cec0087d 100644 --- a/examples/webenginewidgets/spellchecker/CMakeLists.txt +++ b/examples/webenginewidgets/spellchecker/CMakeLists.txt @@ -65,14 +65,18 @@ else() set(spellcheckerDir ${CMAKE_CURRENT_BINARY_DIR}/qtwebengine_dictionaries) endif() +# note setting QT_WEBENGINE_ICU_DATA below is not required if this example +# is not compiled as part of qtwebengine module build + foreach(dictFile ${dicts}) get_filename_component(dictName ${dictFile} NAME_WE) add_custom_command(TARGET spellchecker PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${spellcheckerDir} - COMMAND $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qwebengine_convert_dict> - ${CMAKE_CURRENT_SOURCE_DIR}/dict/${dictFile} - ${spellcheckerDir}/${dictName}.bdic + COMMAND ${CMAKE_COMMAND} -E env + $<IF:$<BOOL:${WEBENGINE_MODULE_BUILD}>,QT_WEBENGINE_ICU_DATA_DIR=${CMAKE_CURRENT_BINARY_DIR}/../../../resources,CMAKE=AWESOME> + $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qwebengine_convert_dict> + ${CMAKE_CURRENT_SOURCE_DIR}/dict/${dictFile} ${spellcheckerDir}/${dictName}.bdic COMMENT "Running qwebengine_convert_dict" ) endforeach() diff --git a/tests/auto/widgets/spellchecking/CMakeLists.txt b/tests/auto/widgets/spellchecking/CMakeLists.txt index afed7e28b..8e1a165c5 100644 --- a/tests/auto/widgets/spellchecking/CMakeLists.txt +++ b/tests/auto/widgets/spellchecking/CMakeLists.txt @@ -31,7 +31,9 @@ foreach(dictFile ${dicts}) add_custom_command(TARGET tst_spellchecking PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${spellcheckerDir} - COMMAND $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qwebengine_convert_dict> + COMMAND ${CMAKE_COMMAND} -E env + $<IF:$<BOOL:${WEBENGINE_MODULE_BUILD}>,QT_WEBENGINE_ICU_DATA_DIR=${CMAKE_CURRENT_BINARY_DIR}/../../../../resources,CMAKE=AWESOME> + $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qwebengine_convert_dict> ${CMAKE_CURRENT_SOURCE_DIR}/dict/${dictFile} ${spellcheckerDir}/${dictName}.bdic COMMENT "Running qwebengine_convert_dict" |