diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-07 19:18:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-07 19:24:24 (GMT) |
| commit | cb53d9309eb932e40fcdf3609eb050358ede2d17 (patch) | |
| tree | abf8d1ce9141777267dc7391380fb1a20b3168e5 /Tests/RunCMake/block/Scope-POLICIES.cmake | |
| parent | 7c52e9e9511ecbd3dad2d0de493ea7329a860c5f (diff) | |
| download | CMake-cb53d9309eb932e40fcdf3609eb050358ede2d17.zip CMake-cb53d9309eb932e40fcdf3609eb050358ede2d17.tar.gz CMake-cb53d9309eb932e40fcdf3609eb050358ede2d17.tar.bz2 | |
block: Fix variable scope protection from modification by subdirectories
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
Diffstat (limited to 'Tests/RunCMake/block/Scope-POLICIES.cmake')
| -rw-r--r-- | Tests/RunCMake/block/Scope-POLICIES.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Tests/RunCMake/block/Scope-POLICIES.cmake b/Tests/RunCMake/block/Scope-POLICIES.cmake index 789b3d9..9536a99 100644 --- a/Tests/RunCMake/block/Scope-POLICIES.cmake +++ b/Tests/RunCMake/block/Scope-POLICIES.cmake @@ -2,6 +2,9 @@ set(VAR1 "OUTER1") set(VAR2 "OUTER2") +set(VARSUB1 "OUTERSUB1") +set(VARSUB2 "OUTERSUB2") + cmake_policy(SET CMP0139 NEW) # create a block with a new scope for policies @@ -9,6 +12,7 @@ block(SCOPE_FOR POLICIES) set(VAR1 "INNER1") unset(VAR2) set(VAR3 "INNER3") + add_subdirectory(Scope) cmake_policy(SET CMP0139 OLD) endblock() @@ -23,6 +27,12 @@ endif() if(NOT DEFINED VAR3 OR NOT VAR3 STREQUAL "INNER3") message(SEND_ERROR "block/endblock: VAR3 has unexpected value: ${VAR3}") endif() +if(NOT DEFINED VARSUB1 OR NOT VARSUB1 STREQUAL "SUBDIR1") + message(SEND_ERROR "block/endblock: VARSUB1 has unexpected value: ${VARSUB1}") +endif() +if(NOT DEFINED VARSUB2 OR NOT VARSUB2 STREQUAL "SUBDIR2") + message(SEND_ERROR "block/endblock: VARSUB2 has unexpected value: ${VARSUB2}") +endif() cmake_policy(GET CMP0139 CMP0139_STATUS) if(NOT CMP0139_STATUS STREQUAL "NEW") |