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 08:11:22 +0000 |
| commit | 9fd9cec7056116688eb924ab8c06f26573dbd232 (patch) | |
| tree | f85477b0d9564f6658d5612ddfbe7ace73344f75 /cmake | |
| parent | 295d056aa0c1a4cf520109dddec09b84c2782c04 (diff) | |
Clean up and fix typos in cmake files
Pick-to: 6.6
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 481657cff..f9742595c 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) @@ -1192,7 +1156,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" "" ) @@ -1340,16 +1304,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" |