mirror of
https://github.com/gbdev/rgbds.git
synced 2025-11-20 18:22:07 +00:00
Make sure to detect Git info from *our* Git repo (#1303)
This commit is contained in:
@@ -73,7 +73,7 @@ endif()
|
|||||||
|
|
||||||
find_program(GIT git)
|
find_program(GIT git)
|
||||||
if(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}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
OUTPUT_VARIABLE GIT_REV OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_VARIABLE GIT_REV OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
ERROR_QUIET)
|
ERROR_QUIET)
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -23,7 +23,7 @@ PNGLDFLAGS := `${PKG_CONFIG} --libs-only-L libpng`
|
|||||||
PNGLDLIBS := `${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
|
# 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
|
# TODO: use -pedantic after non-C++ idioms are gone
|
||||||
WARNFLAGS := -Wall -Wno-unknown-warning-option -Wno-c99-designator
|
WARNFLAGS := -Wall -Wno-unknown-warning-option -Wno-c99-designator
|
||||||
|
|||||||
Reference in New Issue
Block a user