From f77c4ebb7de7df14420729d5d6e002f927c3d9b2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 25 May 2020 19:18:49 +0200 Subject: [PATCH] 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 --- src/corelib/Qt6CoreMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 557bb6b1407..f740fbe9218 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