diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-06 18:48:08 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-06 19:31:13 (GMT) |
| commit | 1844be451e2c27129fbdff9aed121c1b6395c1d0 (patch) | |
| tree | 0a4ea5391b03b4fb89a169154dc69d4c3a215874 /Tests | |
| parent | 13ef3285df97fa97a4cc1b7fe81741aeb8adcf7a (diff) | |
| download | CMake-1844be451e2c27129fbdff9aed121c1b6395c1d0.zip CMake-1844be451e2c27129fbdff9aed121c1b6395c1d0.tar.gz CMake-1844be451e2c27129fbdff9aed121c1b6395c1d0.tar.bz2 | |
Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG
Fix an issue where CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG is specified
and CMAKE_NMC_CROSS_CONFIGS is not, which results in a false error
with CMAKE_NMC_DEFAULT_CONFIGS.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/DefaultBuildFileConfig.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/DefaultBuildFileConfig.cmake b/Tests/RunCMake/NinjaMultiConfig/DefaultBuildFileConfig.cmake new file mode 100644 index 0000000..bb7b160 --- /dev/null +++ b/Tests/RunCMake/NinjaMultiConfig/DefaultBuildFileConfig.cmake @@ -0,0 +1 @@ +# Intentionally empty diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index 2344158..4cf9b04 100644 --- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake @@ -154,6 +154,10 @@ set(RunCMake_TEST_OPTIONS "-DCMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG=Release;-DCMAKE run_cmake(InvalidDefaultConfigsNoCross) unset(RunCMake_TEST_OPTIONS) +set(RunCMake_TEST_OPTIONS "-DCMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG=Release") +run_cmake(DefaultBuildFileConfig) +unset(RunCMake_TEST_OPTIONS) + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SimpleNoCross-build) run_cmake_configure(SimpleNoCross) include(${RunCMake_TEST_BINARY_DIR}/target_files.cmake) |