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 |
|---|---|---|
| CMP0044 | ||
| CMakeLists.txt | -rw-r--r-- | 18.5 KB |
| check-common.cmake | -rw-r--r-- | 154 bytes |
| check-part1.cmake | -rw-r--r-- | 1.8 KB |
| check-part2.cmake | -rw-r--r-- | 2.1 KB |
| check-part3.cmake | -rw-r--r-- | 1.7 KB |
| check-part4.cmake | -rw-r--r-- | 947 bytes |
| check-part5.cmake | -rw-r--r-- | 132 bytes |
| check_object_files.cmake | -rw-r--r-- | 780 bytes |
| echo.c | -rw-r--r-- | 127 bytes |
| empty.cpp | -rw-r--r-- | 72 bytes |
| objlib1.c | -rw-r--r-- | 20 bytes |
| objlib2.c | -rw-r--r-- | 20 bytes |
| pwd.c | -rw-r--r-- | 486 bytes |
| srcgenex.c.in | -rw-r--r-- | 139 bytes |
| srcgenex_includes.c.in | -rw-r--r-- | 133 bytes |
| srcgenex_includes.h.in | -rw-r--r-- | 88 bytes |
Computing file changes ...
