From c04576cd7cdac15576dc78f43ba47d6af5e54c71 Mon Sep 17 00:00:00 2001 From: Orkun Tokdemir Date: Mon, 16 Oct 2023 11:09:58 +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: Iae42755ffc7b2c97e9cda4c211319df767a421b0 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 c65b43fe130..d9789c2ae00 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1061,23 +1061,9 @@ function(qt6_extract_metatypes target) add_dependencies(${target}_automoc_json_extraction ${target}_autogen) _qt_internal_assign_to_internal_targets_folder(${target}_automoc_json_extraction) 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_autogen_build_dir}/timestamp_$") - else() - set(cmake_autogen_timestamp_file - "${target_autogen_build_dir}/timestamp") - endif() + set(cmake_autogen_timestamp_file + "${target_autogen_build_dir}/timestamp" + ) add_custom_command(OUTPUT ${type_list_file} DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser