diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-12-15 14:12:46 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-12 14:04:23 +0000 |
commit | 8e30d44d3ba9d9db1d1a8b8b01d169abe85480e8 (patch) | |
tree | 894def17c935716ec8fa23bb49d7eb9b2746b06b | |
parent | be142ad895c0edb07f567e47fc331c4b241e112f (diff) |
Clean up and fix typos in cmake files
Change-Id: I68e46ec382c4c63c106c545cf6815777954a6afc
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit e6e82804a009394fdccee4e5f37195c9383f2d5a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9fd9cec7056116688eb924ab8c06f26573dbd232)
-rw-r--r-- | cmake/Functions.cmake | 48 | ||||
-rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/core/api/configure.cmake | 2 | ||||
-rw-r--r-- | src/pdf/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 51 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 7bbf8e759..9cee302da 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -24,18 +24,6 @@ function(assertTargets) endforeach() endfunction() -#TODO: remove me -function(add_implicit_dependencies target) - if(TARGET ${target}) - list(REMOVE_ITEM ARGN ${target}) - foreach(qtTarget IN ITEMS ${ARGN}) - if(TARGET Qt::${qtTarget}) - add_dependencies(${target} Qt::${qtTarget}) - endif() - endforeach() - endif() -endfunction() - # TODO: this should be idealy in qtbase function(add_check_for_support) cmake_parse_arguments(PARSE_ARGV 0 arg @@ -65,23 +53,6 @@ function(add_check_for_support) endforeach() endfunction() -function(get_qt_features outList module) - get_cmake_property(variableList VARIABLES) - set(_featureList "") - foreach (variableKey ${variableList}) - unset(FOUND) - string(REGEX MATCH QT_FEATURE_${module} FOUND ${variableKey}) - if(FOUND) - list(APPEND _featureList "${variableKey}=${${variableKey}}") - endif() - endforeach() - if("${${outList}}" STREQUAL "") - set(${outList} ${_featureList} PARENT_SCOPE) - else() - set(${outList} "${${outList}}" "${_featureList}" PARENT_SCOPE) - endif() -endfunction() - function(create_cxx_config cmakeTarget arch configFileName) if(NOT QT_SUPERBUILD AND QT_WILL_INSTALL) get_target_property(mocFilePath Qt6::moc IMPORTED_LOCATION) @@ -325,13 +296,6 @@ function(get_install_config result) endif() endfunction() -macro(assertRunAsTopLevelBuild) - if(NOT DEFINED WEBENGINE_REPO_BUILD) - message(FATAL_ERROR "This cmake file should run as top level build.") - return() - endif() -endmacro() - # we need to pass -F or -iframework in case of frameworks builds, which gn treats as # compiler flag and cmake as include dir, so swap it. function(recoverFrameworkBuild includeDirs compilerFlags) @@ -1154,7 +1118,7 @@ function(get_architectures result) set(${result} ${${result}} PARENT_SCOPE) endfunction() -function(add_gn_build_aritfacts_to_target) +function(add_gn_build_artifacts_to_target) cmake_parse_arguments(PARSE_ARGV 0 arg "" "CMAKE_TARGET;NINJA_TARGET;BUILDDIR;MODULE;COMPLETE_STATIC;NINJA_STAMP;NINJA_DATA_STAMP" "" ) @@ -1304,16 +1268,6 @@ function(addCopyCommand target src dst) ) endfunction() -function(addCopyDirCommand target src dst) - add_custom_command( - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${src} ${dst} - TARGET ${target} - DEPENDS ${src} - USES_TERMINAL - ) -endfunction() - function(check_for_ulimit) message("-- Checking 'ulimit -n'") execute_process(COMMAND bash -c "ulimit -n" diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 570055840..629130c9a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -566,7 +566,7 @@ if(QT_FEATURE_webengine_v8_context_snapshot) set(dataStamp obj/tools/v8_context_snapshot/v8_context_snapshot.stamp) endif() -add_gn_build_aritfacts_to_target( +add_gn_build_artifacts_to_target( CMAKE_TARGET WebEngineCore NINJA_TARGET QtWebEngineCore MODULE core @@ -616,7 +616,7 @@ if(QT_FEATURE_webengine_spellchecker AND NOT CMAKE_CROSSCOMPILING) ../3rdparty/chromium/third_party/boringssl/src/include ${buildDir}/$<CONFIG>/${arch}/gen ) - add_gn_build_aritfacts_to_target( + add_gn_build_artifacts_to_target( CMAKE_TARGET ${dict_target_name} NINJA_TARGET convert_dict MODULE core diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index 762f4bdd6..48f7cacc0 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -168,7 +168,7 @@ qt_feature("webengine-vaapi" PRIVATE ) # internal testing feature qt_feature("webengine-system-poppler" PRIVATE - LABEL "popler" + LABEL "poppler" CONDITION UNIX AND TEST_poppler ) qt_configure_add_summary_section(NAME "Qt WebEngineCore") diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt index 256180441..7c9b41601 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -245,7 +245,7 @@ endforeach() get_architectures(archs) list(GET archs 0 arch) target_include_directories(Pdf PRIVATE ${buildDir}/$<CONFIG>/${arch}/gen) -add_gn_build_aritfacts_to_target( +add_gn_build_artifacts_to_target( CMAKE_TARGET Pdf NINJA_TARGET QtPdf MODULE pdf |