mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 00:11:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ninja Multi-Config: Restore rebuild_cache and edit_cache targets

Browse Source 
Since commit dcf9f4d2f7 (Ninja Multi-Config: Add support for
cross-config custom commands, 2020-12-09) we were not generating these
targets.  Restore them and add a test.

Fixes: #21722
This commit is contained in:
Brad King
2021-01-25 15:12:17 -05:00
parent 6fdbe9201f
commit ccbedb80e4
5 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmNinjaUtilityTargetGenerator.cxx
View File

@@ -35,6 +35,11 @@ cmNinjaUtilityTargetGenerator::~cmNinjaUtilityTargetGenerator() = default;
void cmNinjaUtilityTargetGenerator::Generate(const std::string& config)
{
if (!this->GetGeneratorTarget()->Target->IsPerConfig()) {
this->WriteUtilBuildStatements(config, config);
return;
}
for (auto const& fileConfig : this->GetConfigNames()) {
if (!this->GetGlobalGenerator()
->GetCrossConfigs(fileConfig)

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

@@ -85,6 +85,9 @@ set(RunCMake_TEST_OPTIONS "-DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo\\;Debug\\;
run_cmake_configure(Simple)
unset(RunCMake_TEST_OPTIONS)
include(${RunCMake_TEST_BINARY_DIR}/target_files.cmake)
run_ninja(Simple targets-default build.ninja -t targets)
run_ninja(Simple targets-debug build-Debug.ninja -t targets)
run_ninja(Simple targets-release build-Debug.ninja -t targets)
run_cmake_build(Simple debug-target Debug simpleexe)
run_ninja(Simple debug-target build-Debug.ninja simplestatic)
get_filename_component(simpleshared_Release "${TARGET_FILE_simpleshared_Release}" NAME)

3
Tests/RunCMake/NinjaMultiConfig/Simple-targets-debug-ninja-stdout.txt Normal file
View File

@@ -0,0 +1,3 @@
(rebuild_cache: phony.*
edit_cache: phony|edit_cache: phony.*
rebuild_cache: phony)

3
Tests/RunCMake/NinjaMultiConfig/Simple-targets-default-ninja-stdout.txt Normal file
View File

@@ -0,0 +1,3 @@
(rebuild_cache: phony.*
edit_cache: phony|edit_cache: phony.*
rebuild_cache: phony)

3
Tests/RunCMake/NinjaMultiConfig/Simple-targets-release-ninja-stdout.txt Normal file
View File

@@ -0,0 +1,3 @@
(rebuild_cache: phony.*
edit_cache: phony|edit_cache: phony.*
rebuild_cache: phony)