diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-28 00:05:06 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-28 00:05:06 +0400 |
| commit | 1d2c4357d5faf7417997291efcebcb4cb72791c3 (patch) | |
| tree | 8e3acb195157ab934bc96fc5ae4b509c7c1bfc72 /build_files/cmake | |
| parent | cccee66290a31bdf78c26126782b4b8a2275ea88 (diff) | |
Fix for previous fix (tm) commit
Ok, this is nasty. SOURCE_DIR is somehow being defined
from CMakeLists.txt in source/creator by the looks of it
and actual issue as extra slash in the end of path which
was passing to EXISTS command.
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/buildinfo.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 4c3606576d2..9d315c2518f 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -8,34 +8,34 @@ set(MY_WC_BRANCH "unknown") set(MY_WC_COMMIT_TIMESTAMP 0) # Guess if this is a SVN working copy and then look up the revision -if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) +if(EXISTS ${SOURCE_DIR}/.git) # The FindGit.cmake module is part of the standard distribution include(FindGit) if(GIT_FOUND) message("-- Found Git: ${GIT_EXECUTABLE}") execute_process(COMMAND git rev-parse --short @{u} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE MY_WC_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND git rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE MY_WC_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND git log -1 --format=%ct - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP OUTPUT_STRIP_TRAILING_WHITESPACE) # Update GIT index before getting dirty files execute_process(COMMAND git update-index -q --refresh - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND git diff-index --name-only HEAD -- - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE _git_changed_files OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -44,7 +44,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) else() # Unpushed commits are also considered local odifications execute_process(COMMAND git log @{u}.. - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE _git_unpushed_log OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT _git_unpushed_log STREQUAL "") |