diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-27 23:41:53 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-27 23:43:37 +0400 |
| commit | cccee66290a31bdf78c26126782b4b8a2275ea88 (patch) | |
| tree | 01dabc6f95837a84cf0bc60e1af805f6396d7198 /build_files/cmake/buildinfo.cmake | |
| parent | 29790d4fcad95ec31c801631c699547673bf7fab (diff) | |
Fixes for buildinfo
- It was using SOURCE_DIR which is undefined on windows.
No idea why it was defined on Linux, could be some
co-incident. Correct usage is CMAKE_SOURCE_DIR.
- Remove usages of SVN's revision.
Diffstat (limited to 'build_files/cmake/buildinfo.cmake')
| -rw-r--r-- | build_files/cmake/buildinfo.cmake | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 7fc052eb249..4c3606576d2 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -8,32 +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 ${SOURCE_DIR}/.git/) - # The FindSubversion.cmake module is part of the standard distribution +if(EXISTS ${CMAKE_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 ${SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE MY_WC_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND git rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE MY_WC_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND git log -1 --format=%ct - WORKING_DIRECTORY ${SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_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 ${SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND git diff-index --name-only HEAD -- - WORKING_DIRECTORY ${SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE _git_changed_files OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -42,7 +44,7 @@ if(EXISTS ${SOURCE_DIR}/.git/) else() # Unpushed commits are also considered local odifications execute_process(COMMAND git log @{u}.. - WORKING_DIRECTORY ${SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE _git_unpushed_log OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT _git_unpushed_log STREQUAL "") |