diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-26 15:25:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-26 15:25:46 (GMT) |
| commit | fcafd30a5e8088ef03de487499b1140bad0a6157 (patch) | |
| tree | 1207379d984a5aba55946f2f87d474c0c93da9fd /Tests/RunCMake/NinjaMultiConfig | |
| parent | eeb771e4d6b9a1127a0818a211cafb722a2dc387 (diff) | |
| parent | f8e2a74712c01f205c794102dd0151feace7a5df (diff) | |
| download | CMake-fcafd30a5e8088ef03de487499b1140bad0a6157.zip CMake-fcafd30a5e8088ef03de487499b1140bad0a6157.tar.gz CMake-fcafd30a5e8088ef03de487499b1140bad0a6157.tar.bz2 | |
Merge topic 'ninja-multi-custom-target-post-build'
f8e2a74712 Ninja Multi-Config: Correctly generate POST_BUILD custom targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6040
Diffstat (limited to 'Tests/RunCMake/NinjaMultiConfig')
3 files changed, 14 insertions, 0 deletions
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 0000000..6bf0a49 --- /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 e49cc32..bb68a50 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 23b4aea..aa42739 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) |