diff --git a/cmake/git_version.cmake b/cmake/git_version.cmake index f44754522e8d88c22d05a59050f888b7e954a160..471ae6adcf9a38ff81793ebc26576dc24172b646 100644 --- a/cmake/git_version.cmake +++ b/cmake/git_version.cmake @@ -11,19 +11,19 @@ if (Git_FOUND) ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" ftl_VERSION_MAJOR "${VERSION}") - string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" ftl_VERSION_MINOR "${VERSION}") - string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" ftl_VERSION_PATCH "${VERSION}") - string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+-([0-9]+).*" "\\1" ftl_VERSION_COMMITS "${VERSION}") - string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-(.*)" "\\1" ftl_VERSION_SHA1 "${VERSION}") - set(FTL_VERSION "\"${ftl_VERSION_MAJOR}.${ftl_VERSION_MINOR}.${ftl_VERSION_PATCH}\"") + #string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" ftl_VERSION_MAJOR "${VERSION}") + #string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" ftl_VERSION_MINOR "${VERSION}") + #string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" ftl_VERSION_PATCH "${VERSION}") + #string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+-([0-9]+).*" "\\1" ftl_VERSION_COMMITS "${VERSION}") + #string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-(.*)" "\\1" ftl_VERSION_SHA1 "${VERSION}") + #set(FTL_VERSION "\"${ftl_VERSION_MAJOR}.${ftl_VERSION_MINOR}.${ftl_VERSION_PATCH}\"") else() - - set(ftl_VERSION_MAJOR "0") - set(ftl_VERSION_MINOR "0") - set(ftl_VERSION_PATCH "0") - set(FTL_VERSION "\"${ftl_VERSION_MAJOR}.${ftl_VERSION_MINOR}.${ftl_VERSION_PATCH}\"") + set(VERSION "unknown") + #set(ftl_VERSION_MAJOR "0") + #set(ftl_VERSION_MINOR "0") + #set(ftl_VERSION_PATCH "0") + #set(FTL_VERSION "\"${ftl_VERSION_MAJOR}.${ftl_VERSION_MINOR}.${ftl_VERSION_PATCH}\"") message(WARNING "Version could not be obtained from git") diff --git a/components/common/cpp/src/config.cpp.in b/components/common/cpp/src/config.cpp.in index c0a62b67b1d3fcdcaf62e6c3802d3fa897b54229..15d1bbc11f7254a0eef6852d449a6110b6841607 100644 --- a/components/common/cpp/src/config.cpp.in +++ b/components/common/cpp/src/config.cpp.in @@ -1,10 +1,10 @@ #include <ftl/config.h> const char *FTL_VERSION_LONG = "@VERSION@"; -const char *FTL_VERSION = @FTL_VERSION@; -const int FTL_VERSION_MAJOR = @ftl_VERSION_MAJOR@; -const int FTL_VERSION_MINOR = @ftl_VERSION_MINOR@; -const int FTL_VERSION_PATCH = @ftl_VERSION_PATCH@; -const int FTL_VERSION_COMMITS = @ftl_VERSION_COMMITS@; -const char *FTL_VERSION_SHA1 = "@ftl_VERSION_SHA1@"; +const char *FTL_VERSION = ""; +const int FTL_VERSION_MAJOR = 0; +const int FTL_VERSION_MINOR = 0; +const int FTL_VERSION_PATCH = 0; +const int FTL_VERSION_COMMITS = 0; +const char *FTL_VERSION_SHA1 = "";