Skip to content

Include target architecture in the build stamp. #152

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

Merged
ZivDero merged 2 commits into from
Sep 9, 2026
Merged

Include target architecture in the build stamp. #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ac8195
Derive OPENTS_ARCH from the compiler's architecture id
tinix0 Sep 9, 2026
373d9cf
Report OPENTS_ARCH in the version header and display string
tinix0 Sep 9, 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
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ option(OPENTS_OFFICIAL_BUILD "Build as an official release of the declared versi
option(OPENTS_EXPERIMENTAL_CLANG_CL "Build with clang-cl using the MSVC ABI" OFF)
option(OPENTS_EXPERIMENTAL_X64 "Configure an unsupported 64-bit Windows build" OFF)


if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
if(NOT OPENTS_EXPERIMENTAL_CLANG_CL)
Expand Down Expand Up @@ -41,6 +42,11 @@ else()
"-DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/clang-cl-msvc.cmake.")
endif()

string(TOLOWER "${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" OPENTS_ARCH)
if(NOT OPENTS_ARCH)
set(OPENTS_ARCH "unknown")
endif()

enable_language(RC)

set(CMAKE_CXX_STANDARD 20)
Expand Down Expand Up @@ -71,6 +77,7 @@ set(OPENTS_STAMP_ARGS
"-DOPENTS_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
"-DOPENTS_VERSION_HEADER=${OPENTS_VERSION_HEADER}"
"-DOPENTS_STAMP_HEADER=${OPENTS_STAMP_HEADER}"
"-DOPENTS_ARCH=${OPENTS_ARCH}"
-P "${CMAKE_SOURCE_DIR}/cmake/GitStamp.cmake"
)

Expand Down
10 changes: 6 additions & 4 deletions cmake/GitStamp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ set(VERSION_CONTENT
#else
#define OPENTS_RC_PRERELEASE_FLAG 0x0L
#endif

#define OPENTS_ARCH \"${OPENTS_ARCH}\"
")

set(OPENTS_COMMIT "unknown")
Expand Down Expand Up @@ -173,13 +175,13 @@ if(OPENTS_COMMIT_DIRTY)
endif()

if(OPENTS_OFFICIAL_BUILD)
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION}")
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION} (${OPENTS_ARCH})")
elseif(OPENTS_COMMIT STREQUAL "unknown")
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION}")
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION} (${OPENTS_ARCH})")
elseif(OPENTS_COMMIT_DIRTY)
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION} (${OPENTS_COMMIT}, modified)")
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION} (${OPENTS_COMMIT}, modified, ${OPENTS_ARCH})")
else()
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION} (${OPENTS_COMMIT})")
set(OPENTS_VERSION_DISPLAY "${OPENTS_VERSION} (${OPENTS_COMMIT}, ${OPENTS_ARCH})")
endif()

set(STAMP_CONTENT
Expand Down
2 changes: 1 addition & 1 deletion code/dbgprint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ R"ART(

char line[512];

snprintf(line, sizeof(line), "Version : OpenTS %s (%s build)\n", OPENTS_VERSION, BuildType);
snprintf(line, sizeof(line), "Version : OpenTS %s (%s %s build)\n", OPENTS_VERSION, OPENTS_ARCH, BuildType);
Write_Message_Locked(line, false);

snprintf(line, sizeof(line), "Commit : %s on %s%s\n", OPENTS_COMMIT, OPENTS_BRANCH,
Expand Down
Loading