Harmonise passing build version

Avoid running some configure step, instead pass it as a define like the Makefile
This commit is contained in:
ISSOtm
2026-03-16 23:02:56 +01:00
committed by Rangi
parent 292c297518
commit 5c4ca36c5a
3 changed files with 2 additions and 10 deletions

2
src/.gitignore vendored
View File

@@ -1,2 +0,0 @@
# Generated by CMake
/.version.cpp

View File

@@ -9,8 +9,9 @@ add_library(common OBJECT
"style.cpp"
"usage.cpp"
"util.cpp"
"_version.cpp"
"version.cpp"
)
target_compile_definitions(common PRIVATE "BUILD_VERSION_STRING=\"${GIT_REV}\"")
find_package(BISON 3.0.0 REQUIRED)
set(BISON_FLAGS "-Wall -Dlr.type=ielr")

View File

@@ -25,13 +25,6 @@ extern "C" {
}
#endif
// This variable is passed via `-D` from the Makefile, but not from CMake
// (in which `configure_file()` is used on this file to replace some syntax)
#ifndef BUILD_VERSION_STRING
// CMake-specific syntax here
#define BUILD_VERSION_STRING "@GIT_REV@"
#endif
char const *get_package_version_string() {
if constexpr (literal_strlen(BUILD_VERSION_STRING) > 0) {
return BUILD_VERSION_STRING;