diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-13 16:12:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-13 16:12:28 (GMT) |
| commit | 0d8aec412a99b32c6e23ef774358f2995c32c3f5 (patch) | |
| tree | e9e629f1c8d1151e369de4475abbf11520f15230 /Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | |
| parent | 3bb261b0fedfb2b0e45a5eabc136ff1faea1b914 (diff) | |
| parent | 0199dd9f1b48b47ae63547ffe737ea9169caf511 (diff) | |
| download | CMake-0d8aec412a99b32c6e23ef774358f2995c32c3f5.zip CMake-0d8aec412a99b32c6e23ef774358f2995c32c3f5.tar.gz CMake-0d8aec412a99b32c6e23ef774358f2995c32c3f5.tar.bz2 | |
Merge topic 'fix-cache-args-file-to-dep-list'
0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4710
Diffstat (limited to 'Tests/RunCMake/BuildDepends/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 753417d..7a68c4b 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -46,6 +46,11 @@ endif() run_BuildDepends(Custom-Symbolic-and-Byproduct) run_BuildDepends(Custom-Always) +set(RunCMake_TEST_OUTPUT_MERGE_save "${RunCMake_TEST_OUTPUT_MERGE}") +set(RunCMake_TEST_OUTPUT_MERGE 1) +run_BuildDepends(ExternalProjectCacheArgs) +set(RunCMake_TEST_OUTPUT_MERGE "${RunCMake_TEST_OUTPUT_MERGE_save}") + # Test header dependencies with a build tree underneath a source tree. set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/BuildUnderSource") set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/BuildUnderSource/build") |