diff options
| author | Brad King <brad.king@kitware.com> | 2024-06-21 13:34:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-06-21 16:21:36 (GMT) |
| commit | b1a804d6167c8e2dc82efad72e98be58ce5eb6a5 (patch) | |
| tree | 64c48c1003795329aeae7c92c172881d860b1737 /Tests/RunCMake | |
| parent | 9f8afacb3e512debd1d53f14f685802eda4a54f8 (diff) | |
| download | CMake-b1a804d6167c8e2dc82efad72e98be58ce5eb6a5.zip CMake-b1a804d6167c8e2dc82efad72e98be58ce5eb6a5.tar.gz CMake-b1a804d6167c8e2dc82efad72e98be58ce5eb6a5.tar.bz2 | |
Ninja Multi-Config: Fix crash if config list is changed in subdirectory
Look up the value of `CMAKE_CONFIGURATION_TYPES` only in the top level
directory.
Fixes: #26064
Diffstat (limited to 'Tests/RunCMake')
3 files changed, 6 insertions, 0 deletions
diff --git a/Tests/RunCMake/add_subdirectory/ChangeConfigMulti.cmake b/Tests/RunCMake/add_subdirectory/ChangeConfigMulti.cmake new file mode 100644 index 0000000..449c5c8 --- /dev/null +++ b/Tests/RunCMake/add_subdirectory/ChangeConfigMulti.cmake @@ -0,0 +1 @@ +add_subdirectory(ChangeConfigMulti) diff --git a/Tests/RunCMake/add_subdirectory/ChangeConfigMulti/CMakeLists.txt b/Tests/RunCMake/add_subdirectory/ChangeConfigMulti/CMakeLists.txt new file mode 100644 index 0000000..3ea7fc5 --- /dev/null +++ b/Tests/RunCMake/add_subdirectory/ChangeConfigMulti/CMakeLists.txt @@ -0,0 +1 @@ +set(CMAKE_CONFIGURATION_TYPES NotDebug NotRelease) diff --git a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake index 3c70d07..801abae 100644 --- a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake +++ b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake @@ -7,6 +7,10 @@ set(RunCMake_TEST_OPTIONS -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}) run_cmake(System) unset(RunCMake_TEST_OPTIONS) +if(RunCMake_GENERATOR_IS_MULTI_CONFIG) + run_cmake_with_options(ChangeConfigMulti "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release") +endif() + macro(run_cmake_install case) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) set(RunCMake_TEST_NO_CLEAN 1) |