1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "CMake: Update timestamp file for Multi-Config and Cross-Config builds"

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Orkun Tokdemir 2023-10-16 12:27:00 +02:00
parent 4ecae335f1
commit 4869caead2
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

@ -1025,23 +1025,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_$<CONFIG>")
else()
set(cmake_autogen_timestamp_file
"${target_autogen_build_dir}/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