blob: 145da1d86194db77a8d7d963a1199281b19e0bc7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake
--- a/CMakeModules/GenerateSCMRev.cmake
+++ b/CMakeModules/GenerateSCMRev.cmake
@@ -11,16 +11,16 @@ find_package(Git QUIET PATHS "${GIT_EXEC
# generate git/build information
include(GetGitRevisionDescription)
-if(NOT GIT_REF_SPEC)
- get_git_head_revision(GIT_REF_SPEC GIT_REV)
-endif()
-if(NOT GIT_DESC)
- git_describe(GIT_DESC --always --long --dirty)
-endif()
-if (NOT GIT_BRANCH)
- git_branch_name(GIT_BRANCH)
-endif()
-get_timestamp(BUILD_DATE)
+#if(NOT GIT_REF_SPEC)
+# get_git_head_revision(GIT_REF_SPEC GIT_REV)
+#endif()
+#if(NOT GIT_DESC)
+# git_describe(GIT_DESC --always --long --dirty)
+#endif()
+#if (NOT GIT_BRANCH)
+# git_branch_name(GIT_BRANCH)
+#endif()
+#get_timestamp(BUILD_DATE)
# Generate cpp with Git revision from template
# Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well
@@ -56,4 +56,5 @@ endif()
# The variable SRC_DIR must be passed into the script
# (since it uses the current build directory for all values of CMAKE_*_DIR)
+set(BUILD_FULLNAME "${BUILD_FULLNAME} ")
configure_file("${SRC_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -28,6 +28,7 @@
-DBUILD_TAG=${BUILD_TAG}
-DBUILD_ID=${DISPLAY_VERSION}
-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
+ -DBUILD_DATE=${BUILD_DATE}
-P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake
DEPENDS
# WARNING! It was too much work to try and make a common location for this list,
|