whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 8041bfba47 and 7a87149c25

Change-Id: Iae42755ffc7b2c97e9cda4c211319df767a421b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Orkun Tokdemir 2023-10-16 11:09:58 +02:00
parent 10e3075e6c
commit 4b1d96ea1b
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/Qt6CoreMacros.cmake
View File

@ -1224,23 +1224,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 is_multi_config)
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_$<CONFIG>")
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