diff options
| author | Alexandre Bouvier <[email protected]> | 2022-09-18 00:04:35 +0200 |
|---|---|---|
| committer | Alexandre Bouvier <[email protected]> | 2022-09-18 00:04:35 +0200 |
| commit | 7239470dad92a57ae12fb4430c383df17f539ae1 (patch) | |
| tree | 57c7254a5f1303fc01f07c6b00feed5df9f320c8 /CMakeModules | |
| parent | 7172339c7a49479d9324f28b97124ea68bb4ebdd (diff) | |
| download | yuzu-android-7239470dad92a57ae12fb4430c383df17f539ae1.tar.gz yuzu-android-7239470dad92a57ae12fb4430c383df17f539ae1.zip | |
cmake: fix git detection
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/GenerateSCMRev.cmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake index 0e4bd121c..2cdb9189a 100644 --- a/CMakeModules/GenerateSCMRev.cmake +++ b/CMakeModules/GenerateSCMRev.cmake @@ -7,11 +7,6 @@ function(get_timestamp _var) set(${_var} "${timestamp}" PARENT_SCOPE) 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) if(NOT GIT_REF_SPEC) @@ -29,6 +24,7 @@ get_timestamp(BUILD_DATE) # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well set(REPO_NAME "") set(BUILD_VERSION "0") +set(BUILD_ID ${DISPLAY_VERSION}) if (BUILD_REPOSITORY) # regex capture the string nightly or canary into CMAKE_MATCH_1 string(REGEX MATCH "yuzu-emu/yuzu-?(.*)" OUTVAR ${BUILD_REPOSITORY}) @@ -57,6 +53,4 @@ if (BUILD_REPOSITORY) endif() endif() -# The variable SRC_DIR must be passed into the script -# (since it uses the current build directory for all values of CMAKE_*_DIR) -configure_file("${SRC_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY) +configure_file(scm_rev.cpp.in scm_rev.cpp @ONLY) |