Skip to content
Snippets Groups Projects
Commit 18627aa3 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Merge branch 'master' into feature/voxelhash

parents a2f9e3ae a34448c1
No related branches found
No related tags found
1 merge request!12Feature/voxelhash
Pipeline #10920 failed
...@@ -11,19 +11,19 @@ if (Git_FOUND) ...@@ -11,19 +11,19 @@ if (Git_FOUND)
ERROR_QUIET ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" ftl_VERSION_MAJOR "${VERSION}") #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]+).*" "\\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]+).*" "\\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_COMMITS "${VERSION}")
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-(.*)" "\\1" ftl_VERSION_SHA1 "${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}\"") #set(FTL_VERSION "\"${ftl_VERSION_MAJOR}.${ftl_VERSION_MINOR}.${ftl_VERSION_PATCH}\"")
else() else()
set(VERSION "unknown")
set(ftl_VERSION_MAJOR "0") #set(ftl_VERSION_MAJOR "0")
set(ftl_VERSION_MINOR "0") #set(ftl_VERSION_MINOR "0")
set(ftl_VERSION_PATCH "0") #set(ftl_VERSION_PATCH "0")
set(FTL_VERSION "\"${ftl_VERSION_MAJOR}.${ftl_VERSION_MINOR}.${ftl_VERSION_PATCH}\"") #set(FTL_VERSION "\"${ftl_VERSION_MAJOR}.${ftl_VERSION_MINOR}.${ftl_VERSION_PATCH}\"")
message(WARNING "Version could not be obtained from git") message(WARNING "Version could not be obtained from git")
......
#include <ftl/config.h> #include <ftl/config.h>
const char *FTL_VERSION_LONG = "@VERSION@"; const char *FTL_VERSION_LONG = "@VERSION@";
const char *FTL_VERSION = @FTL_VERSION@; const char *FTL_VERSION = "";
const int FTL_VERSION_MAJOR = @ftl_VERSION_MAJOR@; const int FTL_VERSION_MAJOR = 0;
const int FTL_VERSION_MINOR = @ftl_VERSION_MINOR@; const int FTL_VERSION_MINOR = 0;
const int FTL_VERSION_PATCH = @ftl_VERSION_PATCH@; const int FTL_VERSION_PATCH = 0;
const int FTL_VERSION_COMMITS = @ftl_VERSION_COMMITS@; const int FTL_VERSION_COMMITS = 0;
const char *FTL_VERSION_SHA1 = "@ftl_VERSION_SHA1@"; const char *FTL_VERSION_SHA1 = "";
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment