diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx index a18ca20d50d844fe9ba8b8bf3cfb3fa7ddcf88ce..92c5b521ba6e59570bcf8a6ee934d3a13823dbba 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -173,7 +173,7 @@ void cmNinjaUtilityTargetGenerator::WriteUtilBuildStatements( std::string ccConfig; if (genTarget->Target->IsPerConfig() && genTarget->GetType() != cmStateEnums::GLOBAL_TARGET) { - ccConfig = fileConfig; + ccConfig = config; } if (config == fileConfig || gg->GetPerConfigUtilityTargets().count(genTarget->GetName())) { diff --git a/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-target_post_build-debug-ninja-stdout.txt b/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-target_post_build-debug-ninja-stdout.txt new file mode 100644 index 0000000000000000000000000000000000000000..6bf0a49f30d439c700f1f56565ab10cb369118a7 --- /dev/null +++ b/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex-target_post_build-debug-ninja-stdout.txt @@ -0,0 +1,4 @@ +^\[1/2\] target_post_build +target main build +\[2/2\] Running utility command for target_post_build +target post build$ diff --git a/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex.cmake b/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex.cmake index e49cc32fb99f7a1cca15931df0d2eab23cce700b..bb68a509e634ad1fb28c0b690815518641b84dc3 100644 --- a/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/CustomCommandOutputGenex.cmake @@ -189,3 +189,11 @@ add_custom_target(target_no_cross_byproduct COMMAND echo $<CONFIG> target_no_cross_byproduct.txt WORKING_DIRECTORY $<CONFIG> ) + +add_custom_target(target_post_build + COMMENT target_post_build + COMMAND ${CMAKE_COMMAND} -E echo "target main build" + ) +add_custom_command(TARGET target_post_build POST_BUILD + COMMAND ${CMAKE_COMMAND} -E echo "target post build" + ) diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index 23b4aea481b981a05302b39a4982ec82adf1d7d8..aa427391ea93e7e13977fbffd2afd0b5504d4250 100644 --- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake @@ -364,6 +364,8 @@ run_ninja(CustomCommandOutputGenex target_no_cross_byproduct-debug build-Debug.n run_ninja(CustomCommandOutputGenex clean-debug-graph build-Debug.ninja -t clean) run_ninja(CustomCommandOutputGenex target_no_cross_byproduct-debug-in-release-graph build-Release.ninja target_no_cross_byproduct:Debug) run_ninja(CustomCommandOutputGenex clean-release-graph build-Release.ninja -t clean) +# target_post_build +run_ninja(CustomCommandOutputGenex target_post_build-debug build-Debug.ninja target_post_build) unset(RunCMake_TEST_NO_CLEAN) unset(RunCMake_TEST_BINARY_DIR)