From d1f954395715f50d34e19f62a80f1619e4d453bd Mon Sep 17 00:00:00 2001 From: Orkun Tokdemir Date: Mon, 16 Oct 2023 12:27:00 +0200 Subject: [PATCH] Revert "CMake: Update timestamp file for `Multi-Config` and `Cross-Config` builds" Since https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8878 is reverted, the related change in `qtbase` also should be reverted. This reverts commit 8041bfba47305352627d910930e52da496904c17 and 7a87149c25e04f5f1cbb786fd3b8f78e94574551 Change-Id: Iffba15b3708460f064959b62a9a862e5e62e53cb Reviewed-by: Alexandru Croitor --- src/corelib/Qt6CoreMacros.cmake | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index ddeba4195c7..5e96369df02 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1453,23 +1453,9 @@ function(qt6_extract_metatypes target) ) add_dependencies(${target}_automoc_json_extraction ${target}_autogen) else() - set(use_better_automoc_graph FALSE) - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0" - AND CMAKE_CROSS_CONFIGS) - if(DEFINED QT_USE_BETTER_AUTOMOC_GRAPH) - set(use_better_automoc_graph ${QT_USE_BETTER_AUTOMOC_GRAPH}) - else() - set(use_better_automoc_graph TRUE) - endif() - endif() - - if(use_better_automoc_graph) - set(cmake_autogen_timestamp_file - "${target_binary_dir}/${target}_autogen/timestamp_$") - else() - set(cmake_autogen_timestamp_file - "${target_binary_dir}/${target}_autogen/timestamp") - endif() + set(cmake_autogen_timestamp_file + "${target_binary_dir}/${target}_autogen/timestamp" + ) add_custom_command(OUTPUT ${type_list_file} DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser