diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-21 12:43:24 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-22 17:35:03 +0200 |
commit | d202f90d2e28947e693dd32ea3aab02d97b31310 (patch) | |
tree | 79bfa7c3a047f6520525b8323b340a1ddb0d41aa | |
parent | 5b651959002b7baff439e481bbf9f9076d7b60f3 (diff) |
White-space fixes in Functions.cmake
Change-Id: I124b4d6c30debe46f9929576620afb1b3a73837e
(cherry picked from commit 19e27a6acfd967b0b4213da963bdc556108036bb)
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r-- | cmake/Functions.cmake | 194 |
1 files changed, 97 insertions, 97 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 7e9e42ed4..37d097b6a 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -4,26 +4,26 @@ function(assertTargets errorResult supportResult) set(${supportResult} ON) endif() if(${${supportResult}}) - list(REMOVE_ITEM ARGN ${errorResult}) - list(REMOVE_ITEM ARGN ${supportResult}) - foreach(qtTarget IN ITEMS ${ARGN}) - if(NOT TARGET Qt::${qtTarget}) - set(${errorResult} "Missing required Qt::${qtTarget}." PARENT_SCOPE) - set(${supportResult} OFF PARENT_SCOPE) - return() - endif() - endforeach() + list(REMOVE_ITEM ARGN ${errorResult}) + list(REMOVE_ITEM ARGN ${supportResult}) + foreach(qtTarget IN ITEMS ${ARGN}) + if(NOT TARGET Qt::${qtTarget}) + set(${errorResult} "Missing required Qt::${qtTarget}." PARENT_SCOPE) + set(${supportResult} OFF PARENT_SCOPE) + return() + endif() + endforeach() endif() endfunction() 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() + list(REMOVE_ITEM ARGN ${target}) + foreach(qtTarget IN ITEMS ${ARGN}) + if(TARGET Qt::${qtTarget}) + add_dependencies(${target} Qt::${qtTarget}) + endif() + endforeach() endif() endfunction() @@ -34,10 +34,10 @@ function(add_check_for_support errorResult supportResult) set(${supportResult} ON PARENT_SCOPE) set(${supportResult} ON) endif() - if (${${supportResult}}) + if(${${supportResult}}) qt_parse_all_arguments(arg "add_check_for_support" - "" "MODULE" "MESSAGE;CONDITION" "${ARGN}") - if ("x${arg_CONDITION}" STREQUAL x) + "" "MODULE" "MESSAGE;CONDITION" "${ARGN}") + if("x${arg_CONDITION}" STREQUAL x) set(arg_CONDITION ON) endif() qt_evaluate_config_expression(result ${arg_CONDITION}) @@ -58,11 +58,11 @@ function(get_qt_features outList module) foreach (variableKey ${variableList}) unset(FOUND) string(REGEX MATCH QT_FEATURE_${module} FOUND ${variableKey}) - if (FOUND) + if(FOUND) list(APPEND _featureList "${variableKey}=${${variableKey}}") endif() endforeach() - if ("${${outList}}" STREQUAL "") + if("${${outList}}" STREQUAL "") set(${outList} ${_featureList} PARENT_SCOPE) else() set(${outList} "${${outList}}" "${_featureList}" PARENT_SCOPE) @@ -70,7 +70,7 @@ function(get_qt_features outList module) endfunction() function(get_configure_mode configureMode) - if (NOT DEFINED WEBENGINE_REPO_BUILD AND NOT DEFINED QT_SUPERBUILD) + if(NOT DEFINED WEBENGINE_REPO_BUILD AND NOT DEFINED QT_SUPERBUILD) set(${configureMode} NO_CONFIG_HEADER_FILE NO_SYNC_QT PARENT_SCOPE) endif() endfunction() @@ -78,20 +78,20 @@ endfunction() function(make_config_for_gn target configFileName) if(NOT DEFINED WEBENGINE_REPO_BUILD) file(GENERATE - OUTPUT $<CONFIG>/${configFileName}.cxx.cmake - CONTENT [[ - set(GN_INCLUDES $<TARGET_PROPERTY:INCLUDE_DIRECTORIES>) - set(GN_DEFINES $<TARGET_PROPERTY:COMPILE_DEFINITIONS>) - set(GN_LIBS $<TARGET_PROPERTY:LINK_LIBRARIES>) - set(GN_LINK_OPTIONS $<TARGET_PROPERTY:LINK_OPTIONS>) - set(GN_CXX_COMPILE_OPTIONS $<TARGET_PROPERTY:COMPILE_OPTIONS>)]] - CONDITION $<COMPILE_LANGUAGE:CXX> - TARGET ${target}) + OUTPUT $<CONFIG>/${configFileName}.cxx.cmake + CONTENT [[ + set(GN_INCLUDES $<TARGET_PROPERTY:INCLUDE_DIRECTORIES>) + set(GN_DEFINES $<TARGET_PROPERTY:COMPILE_DEFINITIONS>) + set(GN_LIBS $<TARGET_PROPERTY:LINK_LIBRARIES>) + set(GN_LINK_OPTIONS $<TARGET_PROPERTY:LINK_OPTIONS>) + set(GN_CXX_COMPILE_OPTIONS $<TARGET_PROPERTY:COMPILE_OPTIONS>)]] + CONDITION $<COMPILE_LANGUAGE:CXX> + TARGET ${target}) file(GENERATE - OUTPUT $<CONFIG>/${configFileName}.c.cmake - CONTENT [[ set(GN_C_COMPILE_OPTIONS $<TARGET_PROPERTY:COMPILE_OPTIONS>)]] - CONDITION $<COMPILE_LANGUAGE:C> - TARGET ${target}) + OUTPUT $<CONFIG>/${configFileName}.c.cmake + CONTENT [[ set(GN_C_COMPILE_OPTIONS $<TARGET_PROPERTY:COMPILE_OPTIONS>)]] + CONDITION $<COMPILE_LANGUAGE:C> + TARGET ${target}) endif() endfunction() @@ -119,7 +119,7 @@ macro(applyToGnTarget target) get_target_property(prefix ${target} PREFIX) foreach(element IN LISTS elementList) if(${prefix}_${element}) - message(DEBUG "${prefix}_${element} = ${${prefix}_${element}}") + message(DEBUG "${prefix}_${element} = ${${prefix}_${element}}") set_property(TARGET ${target} APPEND PROPERTY ${prefix}_${element} ${${prefix}_${element}}) endif() endforeach() @@ -128,7 +128,7 @@ endmacro() function(extend_gn_target target) get_target_property(elements ${target} ELEMENTS) qt_parse_all_arguments(GN "extend_gn_target" "" "" "CONDITION;${elements}" "${ARGN}") - if ("x${GN_CONDITION}" STREQUAL x) + if("x${GN_CONDITION}" STREQUAL x) set(GN_CONDITION ON) endif() qt_evaluate_config_expression(result ${GN_CONDITION}) @@ -140,7 +140,7 @@ endfunction() function(extend_gn_list outList) qt_parse_all_arguments(GN "extend_gn_list" "" "" "ARGS;CONDITION" "${ARGN}") - if ("x${GN_CONDITION}" STREQUAL x) + if("x${GN_CONDITION}" STREQUAL x) set(GN_CONDITION ON) endif() qt_evaluate_config_expression(result ${GN_CONDITION}) @@ -211,12 +211,12 @@ function(configure_gn_target target configType inFilePath outFilePath) get_filename_component(GN_SOURCE_ROOT "${CMAKE_CURRENT_LIST_DIR}" REALPATH) if(MACOS) - recoverFrameworkBuild(GN_INCLUDE_DIRS GN_CFLAGS_C) + recoverFrameworkBuild(GN_INCLUDE_DIRS GN_CFLAGS_C) endif() foreach(item GN_HEADERS GN_SOURCES GN_ARGS_DEFINES GN_DEFINES GN_ARGS_INCLUDES - GN_INCLUDE_DIRS GN_CFLAGS_CC GN_CFLAGS_C) - string(REPLACE ";" ",\n " ${item} "${${item}}") + GN_INCLUDE_DIRS GN_CFLAGS_CC GN_CFLAGS_C) + string(REPLACE ";" ",\n " ${item} "${${item}}") endforeach() configure_file(${inFilePath} ${outFilePath} @ONLY) endfunction() @@ -226,8 +226,8 @@ endfunction() function(resolve_target_includes resultVar target) get_target_property(includeDirs ${target} INCLUDE_DIRECTORIES) foreach(includeDir ${includeDirs}) - if (includeDir MATCHES "\\$<BUILD_INTERFACE:([^,>]+)>") - list(APPEND includeDirList ${CMAKE_MATCH_1}) + if(includeDir MATCHES "\\$<BUILD_INTERFACE:([^,>]+)>") + list(APPEND includeDirList ${CMAKE_MATCH_1}) endif() endforeach() set(${resultVar} ${includeDirList} PARENT_SCOPE) @@ -251,7 +251,7 @@ function(get_install_config result) endfunction() macro(assertRunAsTopLevelBuild condition) - if (NOT DEFINED WEBENGINE_REPO_BUILD AND ${condition}) + if(NOT DEFINED WEBENGINE_REPO_BUILD AND ${condition}) message(FATAL_ERROR "This cmake file should run as top level build.") return() endif() @@ -261,10 +261,10 @@ endmacro() # compiler flag and cmake as include dir, so swap it. function(recoverFrameworkBuild includeDirs compilerFlags) foreach(includeDir ${${includeDirs}}) - if (includeDir MATCHES "^\"(.*/([^/]+)\\.framework)\"$") - list(APPEND frameworkDirs \"-iframework${CMAKE_MATCH_1}/..\") + if(includeDir MATCHES "^\"(.*/([^/]+)\\.framework)\"$") + list(APPEND frameworkDirs \"-iframework${CMAKE_MATCH_1}/..\") else() - list(APPEND newIncludeDirs ${includeDir}) + list(APPEND newIncludeDirs ${includeDir}) endif() endforeach() set(${includeDirs} ${newIncludeDirs} PARENT_SCOPE) @@ -275,10 +275,10 @@ endfunction() # forward declarations of NSString. function(get_forward_declaration_macro result) if(MACOS) - set(${result} "Q_FORWARD_DECLARE_OBJC_CLASS(name)=class name;" PARENT_SCOPE) -else() - set(${result} "Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS" PARENT_SCOPE) -endif() + set(${result} "Q_FORWARD_DECLARE_OBJC_CLASS(name)=class name;" PARENT_SCOPE) + else() + set(${result} "Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS" PARENT_SCOPE) + endif() endfunction() function(get_darwin_sdk_version result) @@ -308,37 +308,37 @@ endfunction() function(extend_target_with_gn_objects target config cmakeFile stampFile) - include(${buildDir}/${config}/${cmakeFile}) - - string(TOUPPER ${config} cfg) - add_library(GnObjects_${target}_${config} OBJECT IMPORTED GLOBAL) - target_link_libraries(${target} PRIVATE $<$<CONFIG:${config}>:GnObjects_${target}_${config}>) - add_custom_target(ninja_${target}_${config} DEPENDS ${buildDir}/${config}/${stampFile}) - add_dependencies(GnObjects_${target}_${config} ninja_${target}_${config}) - #TODO: remove GnObjects_${target}_${config} with CMAKE 3.20 - set_property(TARGET GnObjects_${target}_${config} - PROPERTY IMPORTED_OBJECTS_${cfg} ${${cfg}_NINJA_OBJECTS} - ) - set_source_files_properties(${${cfg}_NINJA_OBJECTS} PROPERTIES GENERATED TRUE) - - if(LINUX) - target_link_libraries(${target} - PRIVATE "-Wl,--start-group" "$<$<CONFIG:${config}>:${${cfg}_NINJA_ARCHIVES}>" "-Wl,--end-group") - else() - target_link_libraries(${target} PRIVATE "$<$<CONFIG:${config}>:${${cfg}_NINJA_ARCHIVES}>") - endif() - - target_link_libraries(${target} PUBLIC "$<$<CONFIG:${config}>:${${cfg}_NINJA_LIBS}>") - - # we depend on stampFile, but ninja backend generator needs more (create once) - if(stampFile) - add_custom_command(OUTPUT ${${cfg}_NINJA_OBJECTS} ${${cfg}_NINJA_ARCHIVES} - DEPENDS ${buildDir}/${config}/${stampFile} - ) - add_custom_target(generate_${target}_${cfg} - DEPENDS ${${cfg}_NINJA_OBJECTS} ${${cfg}_NINJA_ARCHIVES} - ) - endif() + include(${buildDir}/${config}/${cmakeFile}) + + string(TOUPPER ${config} cfg) + add_library(GnObjects_${target}_${config} OBJECT IMPORTED GLOBAL) + target_link_libraries(${target} PRIVATE $<$<CONFIG:${config}>:GnObjects_${target}_${config}>) + add_custom_target(ninja_${target}_${config} DEPENDS ${buildDir}/${config}/${stampFile}) + add_dependencies(GnObjects_${target}_${config} ninja_${target}_${config}) + #TODO: remove GnObjects_${target}_${config} with CMAKE 3.20 + set_property(TARGET GnObjects_${target}_${config} + PROPERTY IMPORTED_OBJECTS_${cfg} ${${cfg}_NINJA_OBJECTS} + ) + set_source_files_properties(${${cfg}_NINJA_OBJECTS} PROPERTIES GENERATED TRUE) + + if(LINUX) + target_link_libraries(${target} + PRIVATE "-Wl,--start-group" "$<$<CONFIG:${config}>:${${cfg}_NINJA_ARCHIVES}>" "-Wl,--end-group") + else() + target_link_libraries(${target} PRIVATE "$<$<CONFIG:${config}>:${${cfg}_NINJA_ARCHIVES}>") + endif() + + target_link_libraries(${target} PUBLIC "$<$<CONFIG:${config}>:${${cfg}_NINJA_LIBS}>") + + # we depend on stampFile, but ninja backend generator needs more (create once) + if(stampFile) + add_custom_command(OUTPUT ${${cfg}_NINJA_OBJECTS} ${${cfg}_NINJA_ARCHIVES} + DEPENDS ${buildDir}/${config}/${stampFile} + ) + add_custom_target(generate_${target}_${cfg} + DEPENDS ${${cfg}_NINJA_OBJECTS} ${${cfg}_NINJA_ARCHIVES} + ) + endif() endfunction() function(qt_internal_add_external_project_dependency_to_root_project name) @@ -409,16 +409,16 @@ endfunction() function(extract_cflag result cflag) set(i 1) while(NOT "x${CMAKE_CXX_COMPILER_ARG${i}}" STREQUAL "x") - list(APPEND cflags ${CMAKE_CXX_COMPILER_ARG${i}}) - math(EXPR i "${i} + 1") + list(APPEND cflags ${CMAKE_CXX_COMPILER_ARG${i}}) + math(EXPR i "${i} + 1") endwhile() list(APPEND cflags ${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}) message(DEBUG "Found cflags: ${cflags}") - if (cflags MATCHES "-${cflag}=([^ ]+)") - set(${result} ${CMAKE_MATCH_1} PARENT_SCOPE) - return() + if(cflags MATCHES "-${cflag}=([^ ]+)") + set(${result} ${CMAKE_MATCH_1} PARENT_SCOPE) + return() endif() - if (cflags MATCHES "-${cflag}") + if(cflags MATCHES "-${cflag}") set(${result} ON PARENT_SCOPE) else() set(${result} OFF PARENT_SCOPE) @@ -435,16 +435,16 @@ endfunction() function(get_arm_version result cflag) if(cflag MATCHES "^armv([0-9])") - set(${result} ${CMAKE_MATCH_1} PARENT_SCOPE) + set(${result} ${CMAKE_MATCH_1} PARENT_SCOPE) endif() endfunction() function(check_thumb result) - extract_cflag(thumb "mthumb") - if(thumb) + extract_cflag(thumb "mthumb") + if(thumb) set(${result} TRUE PARENT_SCOPE) return() - else() + else() extract_cflag(marm "marm") if(marm) set(${result} FALSE PARENT_SCOPE) @@ -457,15 +457,15 @@ function(check_thumb result) return() endif() endif() - endif() - set(${result} FALSE PARENT_SCOPE) + endif() + set(${result} FALSE PARENT_SCOPE) endfunction() macro(create_pkg_config_host_wrapper) find_package(PkgConfigHost) - if(CMAKE_CROSSCOMPILING) - create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}") - set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh") + if(CMAKE_CROSSCOMPILING) + create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}") + set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh") endif() endmacro() @@ -547,7 +547,7 @@ macro(append_build_type_setup) endmacro() macro(append_compiler_linker_sdk_setup) - if (CMAKE_CXX_COMPILER_LAUNCHER) + if(CMAKE_CXX_COMPILER_LAUNCHER) list(APPEND gnArgArg cc_wrapper="${CMAKE_CXX_COMPILER_LAUNCHER}") endif() extend_gn_list(gnArgArg |