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

CMake: Depend on automoc timestamp for metatypes extraction

Browse Source 
When using CMake 3.17 with any of the Ninja generators we can leverage
a dependency on the timestamp file produced by CMake's automoc to avoid
having a custom target run on every build.

Change-Id: Ia70d2730cc8296d0a43642655fe69b555cb393c0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2020-03-04 15:58:59 +01:00
parent fda03bfed0
commit 73301b252a
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/corelib/Qt6CoreMacros.cmake
View File

@ -683,19 +683,46 @@ function(qt6_generate_meta_types_json_file target)
set(cmake_autogen_info_file set(cmake_autogen_info_file
"${target_binary_dir}/CMakeFiles/${target}_autogen.dir/AutogenInfo.json") "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/AutogenInfo.json")
add_custom_target(${target}_automoc_json_extraction set (use_dep_files FALSE)
DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.17") # Requires automoc changes present only in 3.17
BYPRODUCTS ${type_list_file} if(CMAKE_GENERATOR STREQUAL "Ninja" OR CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
COMMAND set(use_dep_files TRUE)
${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser endif()
--cmake-autogen-cache-file "${cmake_autogen_cache_file}" endif()
--cmake-autogen-info-file "${cmake_autogen_info_file}"
--output-file-path "${type_list_file}" if (NOT use_dep_files)
${mutli_config_args} add_custom_target(${target}_automoc_json_extraction
COMMENT "Running Automoc file extraction" DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser
COMMAND_EXPAND_LISTS BYPRODUCTS ${type_list_file}
) COMMAND
add_dependencies(${target}_automoc_json_extraction ${target}_autogen) ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser
--cmake-autogen-cache-file "${cmake_autogen_cache_file}"
--cmake-autogen-info-file "${cmake_autogen_info_file}"
--output-file-path "${type_list_file}"
${mutli_config_args}
COMMENT "Running Automoc file extraction"
COMMAND_EXPAND_LISTS
)
add_dependencies(${target}_automoc_json_extraction ${target}_autogen)
else()
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
${cmake_autogen_timestamp_file}
COMMAND
${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser
--cmake-autogen-cache-file "${cmake_autogen_cache_file}"
--cmake-autogen-info-file "${cmake_autogen_info_file}"
--output-file-path "${type_list_file}"
${mutli_config_args}
COMMENT "Running Automoc file extraction"
COMMAND_EXPAND_LISTS
)
endif()
set(automoc_args "@${type_list_file}") set(automoc_args "@${type_list_file}")
set(automoc_dependencies "${type_list_file}") set(automoc_dependencies "${type_list_file}")
endif() endif()