Merge pull request #5166 from LAJW/lajw/version-working-directory

kroening · web-flow · commit 7f1691b875bb · 2019-10-21T14:05:58.000-07:00
Specify working directory for git calls
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -12,6 +12,7 @@ if(GIT_FOUND)
       COMMAND \"${GIT_EXECUTABLE}\" \"describe\" \"--tags\" \"--always\" \"--dirty\"
       OUTPUT_VARIABLE GIT_INFO
       OUTPUT_STRIP_TRAILING_WHITESPACE
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )
     configure_file(\${CUR}/version.cpp.in version.cpp)
     "

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ if(GIT_FOUND)`
`12`	`12`	`COMMAND \"${GIT_EXECUTABLE}\" \"describe\" \"--tags\" \"--always\" \"--dirty\"`
`13`	`13`	`OUTPUT_VARIABLE GIT_INFO`
`14`	`14`	`OUTPUT_STRIP_TRAILING_WHITESPACE`
	`15`	`+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}`
`15`	`16`	`)`
`16`	`17`	`configure_file(\${CUR}/version.cpp.in version.cpp)`
`17`	`18`	`"`