Skip to content

fix(cmake): preserve Windows build OS metadata #35405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VectorPeak wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −2
Open

fix(cmake): preserve Windows build OS metadata #35405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1291e49
fix(cmake): preserve platform os metadata
VectorPeak Jul 16, 2026
08c62ed
fix(cmake): preserve cpu metadata override
VectorPeak Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmake/options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@ if(TD_COMMUNITY_STANDALONE)
set(BUILD_VER_COMPATIBLE "" CACHE STRING "Compatible version number override")
set(BUILD_VER_TYPE "" CACHE STRING "Version type override (e.g. stable)")
set(BUILD_VER_DATE "" CACHE STRING "Version date override (e.g. %Y-%m-%d %H:%M:%S %z)")
set(BUILD_VER_CPUTYPE "" CACHE STRING "CPU type override")
set(BUILD_VER_OSTYPE "" CACHE STRING "OS type override")
if(DEFINED CACHE{BUILD_VER_CPUTYPE} AND NOT "$CACHE{BUILD_VER_CPUTYPE}" STREQUAL "")
set(BUILD_VER_CPUTYPE "$CACHE{BUILD_VER_CPUTYPE}")
else()
set(BUILD_VER_CPUTYPE "${BUILD_VER_CPUTYPE}" CACHE STRING "CPU type override" FORCE)
endif()
if(DEFINED CACHE{BUILD_VER_OSTYPE} AND NOT "$CACHE{BUILD_VER_OSTYPE}" STREQUAL "")

@gemini-code-assist gemini-code-assist Bot Jul 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The variable BUILD_VER_CPUTYPE suffers from the exact same shadowing and first-run clearing issue as BUILD_VER_OSTYPE. In cmake/platform.cmake, BUILD_VER_CPUTYPE is initialized as a normal variable (e.g., SET(BUILD_VER_CPUTYPE "x64")). Then, in cmake/options.cmake (line 15), it is declared as a cache variable: set(BUILD_VER_CPUTYPE "" CACHE STRING "CPU type override"). On the first configure run, this clears the normal variable, resulting in an empty BUILD_VER_CPUTYPE in version.cmake. On subsequent runs, the normal variable set by platform.cmake shadows any user-provided cache override (e.g., -DBUILD_VER_CPUTYPE=arm64). To resolve this, please apply the same robust pattern to BUILD_VER_CPUTYPE as well: if(DEFINED CACHE{BUILD_VER_CPUTYPE} AND NOT "$CACHE{BUILD_VER_CPUTYPE}" STREQUAL "") set(BUILD_VER_CPUTYPE "$CACHE{BUILD_VER_CPUTYPE}") else() set(BUILD_VER_CPUTYPE "${BUILD_VER_CPUTYPE}" CACHE STRING "CPU type override" FORCE) endif()

set(BUILD_VER_OSTYPE "$CACHE{BUILD_VER_OSTYPE}")
else()
set(BUILD_VER_OSTYPE "${BUILD_VER_OSTYPE}" CACHE STRING "OS type override" FORCE)
endif()
set(BUILD_GITINFO "" CACHE STRING "Git commit ID override")
set(BUILD_GITINFOI "" CACHE STRING "Internal git commit ID override")
endif()
Expand Down