cmake: Fix git version info (again). (#2523)
authorAina Niemetz <aina.niemetz@gmail.com>
Tue, 25 Sep 2018 00:32:43 +0000 (17:32 -0700)
committerAndres Noetzli <andres.noetzli@gmail.com>
Tue, 25 Sep 2018 00:32:43 +0000 (17:32 -0700)
src/base/CMakeLists.txt

index c29eaa39392c7bd3ebf1aeeda19a7b234f08b351..0b0da4eee6e5877557d526501be660e6c5679fe4 100644 (file)
@@ -11,7 +11,7 @@ set(GIT_BRANCH "")
 if(GIT_FOUND)
   # Get current git branch, result is != 0 if this is not a git repository
   execute_process(
-    COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+    COMMAND ${GIT_EXECUTABLE} -C ${PROJECT_SOURCE_DIR} rev-parse --abbrev-ref HEAD
     RESULT_VARIABLE GIT_RESULT
     OUTPUT_VARIABLE GIT_BRANCH
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -20,13 +20,13 @@ if(GIT_FOUND)
     set(GIT_BUILD "true")
     # Extract sha1 of HEAD
     execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+      COMMAND ${GIT_EXECUTABLE} -C ${PROJECT_SOURCE_DIR} rev-parse HEAD
       OUTPUT_VARIABLE GIT_SHA1
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     # Result is != 0 if worktree is dirty
     execute_process(
-      COMMAND git diff --quiet
+      COMMAND ${GIT_EXECUTABLE} -C ${PROJECT_SOURCE_DIR} diff --quiet
       RESULT_VARIABLE GIT_RESULT
     )
     if(NOT "${GIT_RESULT}" STREQUAL "0")