mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 15:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'nmc-cache-targets'

Browse Source 
ccbedb80e4 Ninja Multi-Config: Restore rebuild_cache and edit_cache targets
6fdbe9201f cmNinjaUtilityTargetGenerator: Remove leftover development comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5740
This commit is contained in:
Brad King
2021-01-26 14:09:13 +00:00
committed by Kitware Robot
parent bd29de1a91 ccbedb80e4
commit 1380e611e1
5 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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)
@@ -122,8 +127,6 @@ void cmNinjaUtilityTargetGenerator::WriteUtilBuildStatements(
std::copy(util_outputs.begin(), util_outputs.end(),
std::back_inserter(gg->GetByproductsForCleanTarget()));
}
// TODO: Does this need an output config?
// Does this need to go in impl-<config>.ninja?
lg->AppendTargetDepends(genTarget, deps, config, fileConfig,
DependOnTargetArtifact);

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)