Make sure to detect Git info from *our* Git repo (#1303)

This commit is contained in:
Eldred Habert
2024-02-18 23:08:30 +01:00
committed by GitHub
parent 580b7ec5be
commit efaef7039e
2 changed files with 2 additions and 2 deletions

View File

@@ -73,7 +73,7 @@ endif()
find_program(GIT git)
if(GIT)
execute_process(COMMAND ${GIT} describe --tags --dirty --always
execute_process(COMMAND ${GIT} --git-dir=.git describe --tags --dirty --always
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_REV OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)

View File

@@ -23,7 +23,7 @@ PNGLDFLAGS := `${PKG_CONFIG} --libs-only-L libpng`
PNGLDLIBS := `${PKG_CONFIG} --libs-only-l libpng`
# Note: if this comes up empty, `version.cpp` will automatically fall back to last release number
VERSION_STRING := `git describe --tags --dirty --always 2>/dev/null`
VERSION_STRING := `git --git-dir=.git describe --tags --dirty --always 2>/dev/null`
# TODO: use -pedantic after non-C++ idioms are gone
WARNFLAGS := -Wall -Wno-unknown-warning-option -Wno-c99-designator