diff options
| author | Orkun Tokdemir <ilhanorkuntokdemir@gmail.com> | 2024-11-26 10:44:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-11-28 14:13:56 (GMT) |
| commit | 8a526f6a4481cbf69ffed6dc045457f4c1436783 (patch) | |
| tree | f55f9e1bb8f76b39549fb0c63f5111eaea4aab61 /Tests | |
| parent | 3cac48e8cdfc80b2d416fa04e5e1cfc760dba294 (diff) | |
| download | CMake-8a526f6a4481cbf69ffed6dc045457f4c1436783.zip CMake-8a526f6a4481cbf69ffed6dc045457f4c1436783.tar.gz CMake-8a526f6a4481cbf69ffed6dc045457f4c1436783.tar.bz2 | |
Autogen: Fix Ninja Multi-Config dependency graph regression
In commit 5363bebc1e (Autogen: Fix compilation of unchanged source files,
2024-07-16, v3.31.0-rc1~328^2) we relied on Ninja Multi-Config dependency graph
optimizations from commit 7c39dabdbc (Autogen: AUTO*_EXECUTABLE: add support
for per-config values, 2023-10-18, v3.29.0-rc1~105^2~1). However, those graph
optimizations are conditional on versions of Qt that enable
[`AUTOGEN_BETTER_GRAPH_MULTI_CONFIG`](https://codereview.qt-project.org/c/qt/qtbase/+/513648).
`UseBetterGraph` should be checked to add ui files to `timestampByproducts`.
Fixes: #26475
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Autogen_6/RunCMakeTest.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/Autogen_6/RunCMakeTest.cmake b/Tests/RunCMake/Autogen_6/RunCMakeTest.cmake index b629a5c..66514f9 100644 --- a/Tests/RunCMake/Autogen_6/RunCMakeTest.cmake +++ b/Tests/RunCMake/Autogen_6/RunCMakeTest.cmake @@ -6,6 +6,7 @@ if (DEFINED with_qt_version) -Dwith_qt_version=${with_qt_version} "-DQt${with_qt_version}_DIR:PATH=${Qt${with_qt_version}_DIR}" "-DCMAKE_PREFIX_PATH:STRING=${CMAKE_PREFIX_PATH}" + "-DCMAKE_AUTOGEN_BETTER_GRAPH_MULTI_CONFIG=ON" ) if (QtCore_VERSION VERSION_GREATER_EQUAL 5.15.0) macro(set_test_variables_for_unwanted_builds) |