flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2535 from cuberite/FixGitQueries

Browse Source 
Added WORKING_DIRECTORY specification to git queries used in CMake.
This commit is contained in:
worktycho 2015-10-09 10:38:23 +01:00
commit 1a572e6611
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -34,6 +34,7 @@ if(DEFINED ENV{CUBERITE_BUILD_ID})
message("Commit id not set, attempting to determine id from git") message("Commit id not set, attempting to determine id from git")
execute_process( execute_process(
COMMAND git rev-parse HEAD COMMAND git rev-parse HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
RESULT_VARIABLE GIT_EXECUTED RESULT_VARIABLE GIT_EXECUTED
OUTPUT_VARIABLE BUILD_COMMIT_ID OUTPUT_VARIABLE BUILD_COMMIT_ID
) )
@ -48,6 +49,7 @@ else()
set(BUILD_SERIES_NAME "local build") set(BUILD_SERIES_NAME "local build")
execute_process( execute_process(
COMMAND git rev-parse HEAD COMMAND git rev-parse HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
RESULT_VARIABLE GIT_EXECUTED RESULT_VARIABLE GIT_EXECUTED
OUTPUT_VARIABLE BUILD_COMMIT_ID OUTPUT_VARIABLE BUILD_COMMIT_ID
) )
@ -57,6 +59,7 @@ else()
string(STRIP ${BUILD_COMMIT_ID} BUILD_COMMIT_ID) string(STRIP ${BUILD_COMMIT_ID} BUILD_COMMIT_ID)
execute_process( execute_process(
COMMAND git log -1 --date=iso --pretty=format:%ai COMMAND git log -1 --date=iso --pretty=format:%ai
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
RESULT_VARIABLE GIT_EXECUTED RESULT_VARIABLE GIT_EXECUTED
OUTPUT_VARIABLE BUILD_DATETIME OUTPUT_VARIABLE BUILD_DATETIME
) )