Skip to content

Commit 2b32b19

Browse files
committed
brute force it
1 parent e21ee79 commit 2b32b19

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

CMake/ScmRevGen.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ 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)
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")
1314

1415
# remove hash (and trailing "-0" if needed) from description
1516
string(REGEX REPLACE "(-0)?-[^-]+((-dirty)?)$" "\\2" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
@@ -34,8 +35,8 @@ string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
3435

3536
# version number
3637
set(DOLPHIN_VERSION_MAJOR "v3.1.2")
37-
set(DOLPHIN_VERSION_MINOR "mainline-beta.5")
38-
# set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
38+
set(DOLPHIN_VERSION_MINOR "0")
39+
set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
3940

4041
# If Dolphin is not built from a Git repository, default the version info to
4142
# reasonable values.

0 commit comments

Comments
 (0)