diff options
author | Michal Klocek <michal.klocek@qt.io> | 2023-11-24 20:36:34 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2023-11-27 13:50:09 +0100 |
commit | af370e659dece8d2dc40ecf1e6e01f2606668060 (patch) | |
tree | cc5d2aa6a57421ee84f78bb40d948f2f16c46ef0 /cmake | |
parent | a868c4a063a36740732ef26d48eb0da83bdf8262 (diff) |
Minor. Cleanup cmake STREQUAL and add missing quotation marks
Add quotation marks to STREQUAL, as cmake uses
variable expansion in first place.
Note bogus statements like:
if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC) where already
fixed in previous commits.
Pick-to: 6.6
Change-Id: I00d30b2bdf493d4b92b0d45b2804f4132946cfdc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Functions.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 6cba4d24c..a3ddd3f62 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -49,7 +49,7 @@ function(add_check_for_support) set(${module}_SUPPORT ON) endif() if(${module}_SUPPORT) - if("x${arg_CONDITION}" STREQUAL x) + if("x${arg_CONDITION}" STREQUAL "x") set(arg_CONDITION ON) endif() qt_evaluate_config_expression(result ${arg_CONDITION}) @@ -188,7 +188,7 @@ function(extend_gn_target target) cmake_parse_arguments(PARSE_ARGV 1 GN "" "" "CONDITION;${elements}") _qt_internal_validate_all_args_are_parsed(GN) - if("x${GN_CONDITION}" STREQUAL x) + if("x${GN_CONDITION}" STREQUAL "x") set(GN_CONDITION ON) endif() qt_evaluate_config_expression(result ${GN_CONDITION}) @@ -202,7 +202,7 @@ function(extend_gn_list outList) cmake_parse_arguments(PARSE_ARGV 1 GN "" "" "ARGS;CONDITION") _qt_internal_validate_all_args_are_parsed(GN) - if("x${GN_CONDITION}" STREQUAL x) + if("x${GN_CONDITION}" STREQUAL "x") set(GN_CONDITION ON) endif() qt_evaluate_config_expression(result ${GN_CONDITION}) @@ -920,7 +920,7 @@ macro(append_compiler_linker_sdk_setup) extend_gn_list(gnArgArg ARGS is_clang CONDITION CLANG) extend_gn_list(gnArgArg ARGS is_mingw CONDITION MINGW) extend_gn_list(gnArgArg ARGS is_msvc CONDITION MSVC) - extend_gn_list(gnArgArg ARGS is_gcc CONDITION LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) + extend_gn_list(gnArgArg ARGS is_gcc CONDITION LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CLANG) if(MACOS) |