https://github.com/Kitware/CMake
Revision cb53d9309eb932e40fcdf3609eb050358ede2d17 authored by Brad King on 07 November 2022, 19:18:22 UTC, committed by Brad King on 07 November 2022, 19:24:24 UTC
When `cmStateSnapshot::RaiseScope` raises a variable in to a parent directory scope, it uses `GetBuildsystemDirectoryParent` to find the current top-most scope on the directory's stack. Since commit 3f4e5e8c3d (cmState: Return end snapshot for GetBuildsystemDirectoryParent., 2015-09-01, v3.4.0-rc1~100^2~1), that depends on the `DirectoryEnd` field in the directory's state. However, when variable-only scopes were added by commit 6954c8936f (cmState: Add a VariableScope snapshot type., 2015-08-01, v3.4.0-rc1~179^2~1), we neglected to account for the addition of that field by commit 52dbe654de (cmState: Record the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1). Prior to commit 44a2f3f332 (Add new flow-control commands for variables and policies scopes management, 2022-08-05, v3.25.0-rc1~257^2) this problem went unnoticed because there was no way to have a variable scope at the top of a directory's stack while processing a subdirectory. Now the `block()/endblock()` commands enable the behavior, so fix tracking of a variable scope as the top-most scope in a directory. Fixes: #24138
1 parent 7c52e9e
Tip revision: cb53d9309eb932e40fcdf3609eb050358ede2d17 authored by Brad King on 07 November 2022, 19:18:22 UTC
block: Fix variable scope protection from modification by subdirectories
block: Fix variable scope protection from modification by subdirectories
Tip revision: cb53d93
| File | Mode | Size |
|---|---|---|
| .github | ||
| .gitlab | ||
| Auxiliary | ||
| Help | ||
| Licenses | ||
| Modules | ||
| Packaging | ||
| Source | ||
| Templates | ||
| Tests | ||
| Utilities | ||
| .clang-format | -rw-r--r-- | 1.4 KB |
| .clang-tidy | -rw-r--r-- | 1.3 KB |
| .codespellrc | -rw-r--r-- | 570 bytes |
| .editorconfig | -rw-r--r-- | 164 bytes |
| .gitattributes | -rw-r--r-- | 1.2 KB |
| .gitignore | -rw-r--r-- | 324 bytes |
| .gitlab-ci.yml | -rw-r--r-- | 30.2 KB |
| .hooks-config | -rw-r--r-- | 418 bytes |
| CMakeCPack.cmake | -rw-r--r-- | 9.8 KB |
| CMakeCPackOptions.cmake.in | -rw-r--r-- | 12.0 KB |
| CMakeGraphVizOptions.cmake | -rw-r--r-- | 153 bytes |
| CMakeLists.txt | -rw-r--r-- | 19.3 KB |
| CMakeLogo.gif | -rw-r--r-- | 4.4 KB |
| CONTRIBUTING.rst | -rw-r--r-- | 3.0 KB |
| CTestConfig.cmake | -rw-r--r-- | 566 bytes |
| CTestCustom.cmake.in | -rw-r--r-- | 7.3 KB |
| CompileFlags.cmake | -rw-r--r-- | 5.1 KB |
| Copyright.txt | -rw-r--r-- | 5.3 KB |
| DartConfig.cmake | -rw-r--r-- | 374 bytes |
| README.rst | -rw-r--r-- | 3.9 KB |
| bootstrap | -rwxr-xr-x | 63.4 KB |
| cmake_uninstall.cmake.in | -rw-r--r-- | 789 bytes |
| configure | -rwxr-xr-x | 99 bytes |
| doxygen.config | -rw-r--r-- | 27.4 KB |
Computing file changes ...
