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

Merge branch 'ninja-multi-per-config-sources' into release-3.18

Browse Source 
Merge-request: !5430
This commit is contained in:
Brad King
2020-10-26 16:14:00 -04:00
parent 7c0de4175b d13bd6ec3d
commit e9109dec36
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -1202,7 +1202,9 @@ void cmGlobalNinjaGenerator::AddTargetAlias(const std::string& alias,
std::string outputPath = this->NinjaOutputPath(alias);
std::string buildAlias = this->BuildAlias(outputPath, config);
cmNinjaDeps outputs;
this->AppendTargetOutputs(target, outputs, config);
if (config != "all") {
this->AppendTargetOutputs(target, outputs, config);
}
// Mark the target's outputs as ambiguous to ensure that no other target
// uses the output as an alias.
for (std::string const& output : outputs) {

8
Tests/RunCMake/NinjaMultiConfig/PerConfigSources.cmake Normal file
View File

@@ -0,0 +1,8 @@
enable_language(C)
file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/main_$<CONFIG>.c" CONTENT
[[int main(void)
{
return 0;
}
]])
add_executable(exe "${CMAKE_BINARY_DIR}/main_$<CONFIG>.c")

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

@@ -246,6 +246,10 @@ unset(RunCMake_TEST_BINARY_DIR)
run_cmake(CustomCommandDepfile)
set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all")
run_cmake(PerConfigSources)
unset(RunCMake_TEST_OPTIONS)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PostfixAndLocation-build)
set(RunCMake_TEST_OPTIONS "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release;-DCMAKE_CROSS_CONFIGS=all")
run_cmake_configure(PostfixAndLocation)