diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2023-01-20 14:38:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-23 17:21:05 (GMT) |
| commit | 7abddcab08c98a62e5386297124946b6483569ca (patch) | |
| tree | f0caa0ee488e8a3b6e93b77ce182791f066ca9b3 /Tests | |
| parent | f9f34eb11143e5c5c1daee4aa2867139cf930aa4 (diff) | |
| download | CMake-7abddcab08c98a62e5386297124946b6483569ca.zip CMake-7abddcab08c98a62e5386297124946b6483569ca.tar.gz CMake-7abddcab08c98a62e5386297124946b6483569ca.tar.bz2 | |
Ninja: require Ninja 1.11 for C++ module support
See: https://gitlab.kitware.com/cmake/cmake/-/issues/18355#note_1296721
See: https://github.com/ninja-build/ninja/pull/1937
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CXXModules/RunCMakeTest.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt b/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt index 2bee19f..a0b2572 100644 --- a/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt +++ b/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt @@ -15,7 +15,7 @@ CMake Error: .* - due to lack of required features. Ninja 1.10 or higher is required. + due to lack of required features. Ninja 1.11 or higher is required. |CMake Error in CMakeLists.txt: The "nodyndep" target contains C\+\+ module sources which are not supported diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake index 01d59f8..78afd5e 100644 --- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake +++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake @@ -38,7 +38,7 @@ endif () set(generator_supports_cxx_modules 0) if (RunCMake_GENERATOR MATCHES "Ninja" AND - ninja_version VERSION_GREATER_EQUAL "1.10" AND + ninja_version VERSION_GREATER_EQUAL "1.11" AND "cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES) set(generator_supports_cxx_modules 1) endif () |