diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-26 13:23:13 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-26 09:23:19 -0400 |
| commit | 2a2afe0ae4eeb417583cf3d84ebbcb365973bbe0 (patch) | |
| tree | 52715da1da8654012b8c995416b4b5f543fb8ed0 | |
| parent | fef28dbc1e252f5431f3602129a3b3a6cc0ab7bf (diff) | |
| parent | 3b864b2583d977898638336f5a096ff33955bd7a (diff) | |
| download | cmake-2a2afe0ae4eeb417583cf3d84ebbcb365973bbe0.tar.gz | |
Merge topic 'ninja-multi-long-custom-command' into release-3.20
3b864b2583 Ninja Multi-Config: Include configs in long CC scripts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5941
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/LongCommandLine.cmake | 16 | ||||
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake | 5 |
3 files changed, 27 insertions, 0 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 8ed411a3ca..a1b350da8d 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -651,6 +651,12 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatement( gg->WriteBuild(this->GetImplFileStream(fileConfig), build); } else { std::string customStep = cmSystemTools::GetFilenameName(ninjaOutputs[0]); + if (this->GlobalGenerator->IsMultiConfig()) { + customStep += '-'; + customStep += fileConfig; + customStep += '-'; + customStep += ccg.GetOutputConfig(); + } // Hash full path to make unique. customStep += '-'; cmCryptoHash hash(cmCryptoHash::AlgoSHA256); diff --git a/Tests/RunCMake/NinjaMultiConfig/LongCommandLine.cmake b/Tests/RunCMake/NinjaMultiConfig/LongCommandLine.cmake new file mode 100644 index 0000000000..00aa896af2 --- /dev/null +++ b/Tests/RunCMake/NinjaMultiConfig/LongCommandLine.cmake @@ -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" + ) diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index 21c2658c7f..0d4db52403 100644 --- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake @@ -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_OPTIONS "-DCMAKE_CROSS_CONFIGS=all") run_cmake_configure(PostBuild) +unset(RunCMake_TEST_OPTIONS) run_cmake_build(PostBuild release Release Exe) 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_OPTIONS "-DCMAKE_CROSS_CONFIGS=all") run_cmake_configure(Framework) |