diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-24 15:50:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-09-30 13:18:20 (GMT) |
| commit | b3b1c7bf3afc8f33fa69b79f47f778cb781ac3c7 (patch) | |
| tree | 09b98e18bdbd44c02d199db0aec22ea368bf27f9 /Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake | |
| parent | cf01d3d2bd649ab1157641b3212a360b06db747f (diff) | |
| download | CMake-b3b1c7bf3afc8f33fa69b79f47f778cb781ac3c7.zip CMake-b3b1c7bf3afc8f33fa69b79f47f778cb781ac3c7.tar.gz CMake-b3b1c7bf3afc8f33fa69b79f47f778cb781ac3c7.tar.bz2 | |
Restore "all" target in subdirectories marked EXCLUDE_FROM_ALL
The "all" target in each directory is supposed to have targets from that
directory even if the directory itself is marked `EXCLUDE_FROM_ALL` in
its parent. This was broken by commit dc6888573d (Pass EXCLUDE_FROM_ALL
from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) which made the
participation of a target in "all" independent of context. Revert much
of the logic change from that commit to restore the old behavior. Then
re-implement the behavior intended by the commit to keep its test
working. Extend the test to cover the old behavior too.
Fixes: #19753
Diffstat (limited to 'Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake')
| -rw-r--r-- | Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake index 16f39d9..ff676a6 100644 --- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake +++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake @@ -9,5 +9,6 @@ file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/check-$<LOWER_CASE:$<CONFIG>>.c set(main_exe \"$<TARGET_FILE:main>\") set(foo_lib \"$<TARGET_FILE:foo>\") set(bar_lib \"$<TARGET_FILE:bar>\") +set(zot_lib \"$<TARGET_FILE:zot>\") set(subinc_lib \"$<TARGET_FILE:subinc>\") ") |