diff options
| author | bunnei <bunneidev@gmail.com> | 2020-01-16 16:00:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 16:00:43 +0100 |
| commit | a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc (patch) | |
| tree | 886130420a22ae13106179ed4c25bb02ce260701 | |
| parent | Merge pull request #3303 from lioncash/reorder (diff) | |
| parent | Fix git version in scm_rev.cpp (diff) | |
| download | yuzu-a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc.tar yuzu-a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc.tar.gz yuzu-a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc.tar.bz2 yuzu-a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc.tar.lz yuzu-a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc.tar.xz yuzu-a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc.tar.zst yuzu-a43ac8c79e5dae76a5a64f388045f0fa8c16b0cc.zip | |
| -rw-r--r-- | CMakeModules/GenerateSCMRev.cmake | 4 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake index 21e03ae98..fa7ae835f 100644 --- a/CMakeModules/GenerateSCMRev.cmake +++ b/CMakeModules/GenerateSCMRev.cmake @@ -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) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 9b0c3db68..9afc6105d 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -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, |