mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-06 23:11:25 +12:00
Partially revert git-version.cmake
This commit is contained in:
parent
f8e4079c41
commit
407be45069
1 changed files with 6 additions and 10 deletions
|
@ -9,19 +9,13 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
|
||||||
OUTPUT_VARIABLE RPCS3_GIT_VERSION)
|
OUTPUT_VARIABLE RPCS3_GIT_VERSION)
|
||||||
if(NOT ${exit_code} EQUAL 0)
|
if(NOT ${exit_code} EQUAL 0)
|
||||||
message(WARNING "git rev-list failed, unable to include version.")
|
message(WARNING "git rev-list failed, unable to include version.")
|
||||||
else()
|
|
||||||
string(STRIP ${RPCS3_GIT_VERSION} RPCS3_GIT_VERSION)
|
|
||||||
endif()
|
endif()
|
||||||
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
|
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
RESULT_VARIABLE exit_code2
|
RESULT_VARIABLE exit_code
|
||||||
OUTPUT_VARIABLE GIT_VERSION_)
|
OUTPUT_VARIABLE GIT_VERSION_)
|
||||||
if(NOT ${exit_code2} EQUAL 0)
|
if(NOT ${exit_code} EQUAL 0)
|
||||||
message(WARNING "git rev-parse failed, unable to include version.")
|
message(WARNING "git rev-parse failed, unable to include version.")
|
||||||
string(STRIP ${GIT_VERSION_} GIT_VERSION_)
|
|
||||||
if(${exit_code} EQUAL 0)
|
|
||||||
string(STRIP ${RPCS3_GIT_VERSION}-${GIT_VERSION_} RPCS3_GIT_VERSION)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
|
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
|
@ -29,10 +23,12 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
|
||||||
OUTPUT_VARIABLE RPCS3_GIT_BRANCH)
|
OUTPUT_VARIABLE RPCS3_GIT_BRANCH)
|
||||||
if(NOT ${exit_code} EQUAL 0)
|
if(NOT ${exit_code} EQUAL 0)
|
||||||
message(WARNING "git rev-parse failed, unable to include git branch.")
|
message(WARNING "git rev-parse failed, unable to include git branch.")
|
||||||
else()
|
|
||||||
string(STRIP ${RPCS3_GIT_BRANCH} RPCS3_GIT_BRANCH)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
string(STRIP ${RPCS3_GIT_VERSION} RPCS3_GIT_VERSION)
|
||||||
|
string(STRIP ${GIT_VERSION_} GIT_VERSION_)
|
||||||
|
string(STRIP ${RPCS3_GIT_VERSION}-${GIT_VERSION_} RPCS3_GIT_VERSION)
|
||||||
|
string(STRIP ${RPCS3_GIT_BRANCH} RPCS3_GIT_BRANCH)
|
||||||
else()
|
else()
|
||||||
message(WARNING "git not found, unable to include version.")
|
message(WARNING "git not found, unable to include version.")
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue