1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Handle single- and multi-config differences more robustly

Browse Source 
Projects sometimes set both CMAKE_CONFIGURATION_TYPES and
CMAKE_BUILD_TYPE regardless of what CMake generator they are using.
They shouldn't, but it is common enough that we should protect against
it. The GENERATOR_IS_MULTI_CONFIG global property is the only robust
way to know which type of generator we are using, so switch to that for
how we detect this.

Pick-to: 6.2
Change-Id: If5d6568da0d2adb3275bbaf9a7d3bd3e033dc636
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Craig Scott 2021-07-13 11:05:52 +10:00
parent fb9cbd3b2a
commit b30ac93a37
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/Qt6CoreMacros.cmake
View File

@ -970,16 +970,17 @@ function(qt6_extract_metatypes target)
AUTOMOC_MOC_OPTIONS "--output-json" AUTOMOC_MOC_OPTIONS "--output-json"
) )
if(NOT CMAKE_CONFIGURATION_TYPES) get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(NOT is_multi_config)
set(cmake_autogen_cache_file set(cmake_autogen_cache_file
"${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache.txt") "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache.txt")
set(mutli_config_args set(multi_config_args
--cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include" --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include"
) )
else() else()
set(cmake_autogen_cache_file set(cmake_autogen_cache_file
"${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache_$<CONFIG>.txt") "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache_$<CONFIG>.txt")
set(mutli_config_args set(multi_config_args
--cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include_$<CONFIG>" --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include_$<CONFIG>"
"--cmake-multi-config") "--cmake-multi-config")
endif() endif()
@ -1029,7 +1030,7 @@ function(qt6_extract_metatypes target)
--cmake-autogen-cache-file "${cmake_autogen_cache_file}" --cmake-autogen-cache-file "${cmake_autogen_cache_file}"
--cmake-autogen-info-file "${cmake_autogen_info_file}" --cmake-autogen-info-file "${cmake_autogen_info_file}"
--output-file-path "${type_list_file}" --output-file-path "${type_list_file}"
${mutli_config_args} ${multi_config_args}
COMMENT "Running AUTOMOC file extraction for target ${target}" COMMENT "Running AUTOMOC file extraction for target ${target}"
COMMAND_EXPAND_LISTS COMMAND_EXPAND_LISTS
) )
@ -1047,7 +1048,7 @@ function(qt6_extract_metatypes target)
--cmake-autogen-cache-file "${cmake_autogen_cache_file}" --cmake-autogen-cache-file "${cmake_autogen_cache_file}"
--cmake-autogen-info-file "${cmake_autogen_info_file}" --cmake-autogen-info-file "${cmake_autogen_info_file}"
--output-file-path "${type_list_file}" --output-file-path "${type_list_file}"
${mutli_config_args} ${multi_config_args}
COMMENT "Running AUTOMOC file extraction for target ${target}" COMMENT "Running AUTOMOC file extraction for target ${target}"
COMMAND_EXPAND_LISTS COMMAND_EXPAND_LISTS
) )
@ -1073,7 +1074,7 @@ function(qt6_extract_metatypes target)
message(FATAL_ERROR "Metatype generation requires either the use of AUTOMOC or a manual list of generated json files") message(FATAL_ERROR "Metatype generation requires either the use of AUTOMOC or a manual list of generated json files")
endif() endif()
if (CMAKE_BUILD_TYPE) if (CMAKE_BUILD_TYPE AND NOT is_multi_config)
string(TOLOWER ${target}_${CMAKE_BUILD_TYPE} target_lowercase) string(TOLOWER ${target}_${CMAKE_BUILD_TYPE} target_lowercase)
else() else()
string(TOLOWER ${target} target_lowercase) string(TOLOWER ${target} target_lowercase)