reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-03 17:39:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'ninja-multi-default-config-fix' into release-3.17

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
commit 135378fd18
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalNinjaGenerator.cxx
View File

@ -2657,6 +2657,7 @@ bool cmGlobalNinjaMultiGenerator::ReadCacheEntriesForBuild(
defaultConfigsString = this->DefaultFileConfig; defaultConfigsString = this->DefaultFileConfig;
} }
if (!defaultConfigsString.empty() && if (!defaultConfigsString.empty() &&
defaultConfigsString != this->DefaultFileConfig &&
(this->DefaultFileConfig.empty() || this->CrossConfigs.empty())) { (this->DefaultFileConfig.empty() || this->CrossConfigs.empty())) {
std::ostringstream msg; std::ostringstream msg;
msg << "CMAKE_NMC_DEFAULT_CONFIGS cannot be used without " msg << "CMAKE_NMC_DEFAULT_CONFIGS cannot be used without "

1
Tests/RunCMake/NinjaMultiConfig/DefaultBuildFileConfig.cmake Normal file
View File

@ -0,0 +1 @@
# Intentionally empty

4
Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
View File

@ -154,6 +154,10 @@ set(RunCMake_TEST_OPTIONS "-DCMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG=Release;-DCMAKE
run_cmake(InvalidDefaultConfigsNoCross) run_cmake(InvalidDefaultConfigsNoCross)
unset(RunCMake_TEST_OPTIONS) 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) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SimpleNoCross-build)
run_cmake_configure(SimpleNoCross) run_cmake_configure(SimpleNoCross)
include(${RunCMake_TEST_BINARY_DIR}/target_files.cmake) include(${RunCMake_TEST_BINARY_DIR}/target_files.cmake)