Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-21 06:10:16 +08:00
Code Issues Projects Releases Wiki Activity

Ninja Multi-Config: Include configs in long CC scripts

Browse Source 
Fixes: #21973
This commit is contained in:
Kyle Edwards
2021-03-25 13:18:47 -04:00
parent fef28dbc1e
commit 3b864b2583
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalNinjaGenerator.cxx
View File

@@ -651,6 +651,12 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
gg->WriteBuild(this->GetImplFileStream(fileConfig), build); gg->WriteBuild(this->GetImplFileStream(fileConfig), build);
} else { } else {
std::string customStep = cmSystemTools::GetFilenameName(ninjaOutputs[0]); std::string customStep = cmSystemTools::GetFilenameName(ninjaOutputs[0]);
if (this->GlobalGenerator->IsMultiConfig()) {
customStep += '-';
customStep += fileConfig;
customStep += '-';
customStep += ccg.GetOutputConfig();
}
// Hash full path to make unique. // Hash full path to make unique.
customStep += '-'; customStep += '-';
cmCryptoHash hash(cmCryptoHash::AlgoSHA256); cmCryptoHash hash(cmCryptoHash::AlgoSHA256);

16
Tests/RunCMake/NinjaMultiConfig/LongCommandLine.cmake Normal file
View File

@@ -0,0 +1,16 @@
enable_language(C)
add_executable(generator main.c)
string(REPEAT "." 5000 very_long)
add_custom_command(
OUTPUT gen.txt
COMMAND generator "${very_long}" > gen.txt
)
add_custom_target(
custom
ALL
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gen.txt"
)

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

@@ -193,9 +193,14 @@ run_cmake_build(SimpleCrossConfigs all-relwithdebinfo-in-release-graph Release a
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PostBuild-build) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/PostBuild-build)
set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all") set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all")
run_cmake_configure(PostBuild) run_cmake_configure(PostBuild)
unset(RunCMake_TEST_OPTIONS)
run_cmake_build(PostBuild release Release Exe) run_cmake_build(PostBuild release Release Exe)
run_cmake_build(PostBuild debug-in-release-graph Release Exe:Debug) run_cmake_build(PostBuild debug-in-release-graph Release Exe:Debug)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/LongCommandLine-build)
run_cmake_configure(LongCommandLine)
run_cmake_build(LongCommandLine release Release custom)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Framework-build) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Framework-build)
set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all") set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all")
run_cmake_configure(Framework) run_cmake_configure(Framework)