mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-multi-default-config-fix'

Browse Source 
1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4331
This commit is contained in:
Brad King
2020-02-07 14:26:29 +00:00
committed by Kitware Robot
parent b3fd1bcfa5 1844be451e
commit 4e44cbc673
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/NinjaMultiConfig/DefaultBuildFileConfig.cmake
+1
View File
@@ -0,0 +1 @@
# Intentionally empty
Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
+4
View File
@@ -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)