mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-19 21:50:39 -06:00
cb53d9309e
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 commit3f4e5e8c3d(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 commit6954c8936f(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 commit52dbe654de(cmState: Record the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1). Prior to commit44a2f3f332(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
41 lines
1.2 KiB
CMake
41 lines
1.2 KiB
CMake
|
|
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
|
|
block(SCOPE_FOR POLICIES)
|
|
set(VAR1 "INNER1")
|
|
unset(VAR2)
|
|
set(VAR3 "INNER3")
|
|
add_subdirectory(Scope)
|
|
|
|
cmake_policy(SET CMP0139 OLD)
|
|
endblock()
|
|
|
|
# check final values for variables
|
|
if(NOT DEFINED VAR1 OR NOT VAR1 STREQUAL "INNER1")
|
|
message(SEND_ERROR "block/endblock: VAR1 has unexpected value: ${VAR1}")
|
|
endif()
|
|
if(DEFINED VAR2)
|
|
message(SEND_ERROR "block/endblock: VAR2 is unexpectedly defined: ${VAR2}")
|
|
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")
|
|
message(SEND_ERROR "block/endblock: CMP0139 has unexpected value: ${CMP0139_STATUS}")
|
|
endif()
|