diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-25 18:09:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-09-30 14:30:28 (GMT) |
| commit | 0733a94f648d63e8492fbcff3413cef461cb18d8 (patch) | |
| tree | 516ebdb91a4fa5e832c9e3f89fd22d7bea22315d /Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake | |
| parent | 11fb377eb96e6a90ea96126a2d22739f6983182a (diff) | |
| download | CMake-0733a94f648d63e8492fbcff3413cef461cb18d8.zip CMake-0733a94f648d63e8492fbcff3413cef461cb18d8.tar.gz CMake-0733a94f648d63e8492fbcff3413cef461cb18d8.tar.bz2 | |
Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdir
The "all" target defined for a subdirectory (e.g. `cd sub; make` or
`ninja sub/all`) should not include the "all" targets from nested
subdirectories (e.g. `sub/sub`) that are marked as `EXCLUDE_FROM_ALL`.
Fix this and add a test case.
Issue: #19753
Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
Diffstat (limited to 'Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake')
| -rw-r--r-- | Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake index 433c032..b229f4c 100644 --- a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake +++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake @@ -21,6 +21,7 @@ if(EXISTS ${RunCMake_TEST_BINARY_DIR}/check-debug.cmake) foreach(file "${zot_lib}" "${bar_lib}" + "${subsub_lib}" ) if(EXISTS "${file}") set(RunCMake_TEST_FAILED |