Skip to content

Commit 67fc617

Browse files
committed
Adjust ScmRevGen to match our use case better
1 parent 2b32b19 commit 67fc617

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

CMake/ScmRevGen.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ if(GIT_FOUND)
77
OUTPUT_VARIABLE DOLPHIN_WC_REVISION
88
OUTPUT_STRIP_TRAILING_WHITESPACE)
99
# defines DOLPHIN_WC_DESCRIBE
10-
#execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long # --dirty # removed from here while we're using a patch for SDL; will likely be fixed in the future
11-
# OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
12-
# OUTPUT_STRIP_TRAILING_WHITESPACE)
13-
set(DOLPHIN_WC_DESCRIBE "v3.1.2-mainline-beta.5")
10+
execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --tags # --always --long --dirty # removed from here while we're using a patch for SDL; will likely be fixed in the future
11+
OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
12+
OUTPUT_STRIP_TRAILING_WHITESPACE)
1413

1514
# remove hash (and trailing "-0" if needed) from description
1615
string(REGEX REPLACE "(-0)?-[^-]+((-dirty)?)$" "\\2" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")

0 commit comments

Comments
 (0)