summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-05-25 19:18:49 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-05-29 17:17:15 +0200
commitf77c4ebb7de7df14420729d5d6e002f927c3d9b2 (patch)
treed3139c81d1a411a660dfb5e7ae8c82e050e1a241 /src/corelib
parent4182cf409ef8a029fb43c79d39ddc1ee0d510341 (diff)
CMake: Check CMAKE_CONFIGURATION_TYPES when doing automoc extraction
Otherwise when configuring a standalone example without specifying a CMAKE_BUILD_TYPE (so it's empty), building fails because qt6_generate_meta_types_json_file thinks it's being called with a multi-config generator. Change-Id: I360c7dbb19522155d8e72f98836fb663916715a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/Qt6CoreMacros.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 557bb6b140..f740fbe921 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -619,7 +619,7 @@ function(qt6_generate_meta_types_json_file target)
AUTOMOC_MOC_OPTIONS "--output-json"
)
- if(CMAKE_BUILD_TYPE)
+ if(NOT CMAKE_CONFIGURATION_TYPES)
set(cmake_autogen_cache_file
"${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache.txt")
set(mutli_config_args