-
- Downloads
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 dc688857 (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
Showing
- Help/prop_dir/EXCLUDE_FROM_ALL.rst 9 additions, 11 deletionsHelp/prop_dir/EXCLUDE_FROM_ALL.rst
- Help/prop_tgt/EXCLUDE_FROM_ALL.rst 8 additions, 8 deletionsHelp/prop_tgt/EXCLUDE_FROM_ALL.rst
- Source/cmGlobalGenerator.cxx 11 additions, 3 deletionsSource/cmGlobalGenerator.cxx
- Source/cmGlobalGenerator.h 1 addition, 1 deletionSource/cmGlobalGenerator.h
- Source/cmGlobalNinjaGenerator.h 2 additions, 2 deletionsSource/cmGlobalNinjaGenerator.h
- Source/cmGlobalUnixMakefileGenerator3.cxx 2 additions, 2 deletionsSource/cmGlobalUnixMakefileGenerator3.cxx
- Source/cmGlobalVisualStudioGenerator.cxx 1 addition, 1 deletionSource/cmGlobalVisualStudioGenerator.cxx
- Source/cmGlobalXCodeGenerator.cxx 1 addition, 1 deletionSource/cmGlobalXCodeGenerator.cxx
- Source/cmLocalNinjaGenerator.cxx 3 additions, 1 deletionSource/cmLocalNinjaGenerator.cxx
- Source/cmMakefile.cxx 4 additions, 6 deletionsSource/cmMakefile.cxx
- Tests/RunCMake/add_subdirectory/ExcludeFromAll-build-sub-stderr.txt 1 addition, 0 deletions...Make/add_subdirectory/ExcludeFromAll-build-sub-stderr.txt
- Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake 1 addition, 0 deletionsTests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
- Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt 5 additions, 1 deletion...s/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
- Tests/RunCMake/add_subdirectory/ExcludeFromAll/check-sub.cmake 32 additions, 0 deletions.../RunCMake/add_subdirectory/ExcludeFromAll/check-sub.cmake
- Tests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake 5 additions, 1 deletionTests/RunCMake/add_subdirectory/ExcludeFromAll/check.cmake
- Tests/RunCMake/add_subdirectory/ExcludeFromAll/zot.cpp 4 additions, 0 deletionsTests/RunCMake/add_subdirectory/ExcludeFromAll/zot.cpp
- Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake 20 additions, 0 deletionsTests/RunCMake/add_subdirectory/RunCMakeTest.cmake
Loading
Please register or sign in to comment