Browse Source
Merge pull request #3307 from jroweboy/fix-git
Fix git version in scm_rev.cpp
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
9 additions and
0 deletions
-
CMakeModules/GenerateSCMRev.cmake
-
src/common/CMakeLists.txt
|
|
|
@ -5,6 +5,10 @@ function(get_timestamp _var) |
|
|
|
endfunction() |
|
|
|
|
|
|
|
list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules") |
|
|
|
|
|
|
|
# Find the package here with the known path so that the GetGit commands can find it as well |
|
|
|
find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") |
|
|
|
|
|
|
|
# generate git/build information |
|
|
|
include(GetGitRevisionDescription) |
|
|
|
get_git_head_revision(GIT_REF_SPEC GIT_REV) |
|
|
|
|
|
|
|
@ -15,6 +15,10 @@ endif () |
|
|
|
if (DEFINED ENV{DISPLAYVERSION}) |
|
|
|
set(DISPLAY_VERSION $ENV{DISPLAYVERSION}) |
|
|
|
endif () |
|
|
|
|
|
|
|
# Pass the path to git to the GenerateSCMRev.cmake as well |
|
|
|
find_package(Git QUIET) |
|
|
|
|
|
|
|
add_custom_command(OUTPUT scm_rev.cpp |
|
|
|
COMMAND ${CMAKE_COMMAND} |
|
|
|
-DSRC_DIR="${CMAKE_SOURCE_DIR}" |
|
|
|
@ -23,6 +27,7 @@ add_custom_command(OUTPUT scm_rev.cpp |
|
|
|
-DTITLE_BAR_FORMAT_RUNNING="${TITLE_BAR_FORMAT_RUNNING}" |
|
|
|
-DBUILD_TAG="${BUILD_TAG}" |
|
|
|
-DBUILD_ID="${DISPLAY_VERSION}" |
|
|
|
-DGIT_EXECUTABLE="${GIT_EXECUTABLE}" |
|
|
|
-P "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" |
|
|
|
DEPENDS |
|
|
|
# WARNING! It was too much work to try and make a common location for this list, |
|
|
|
|