Merge pull request #600 from ut-issl/feature/fix-core-git-revision-ou…

…tput Pre Release (v3.9.0-beta.8): Fix get c2a-core git revision working dir
ut-issl · May 31, 2023 · aedb983 · aedb983
2 parents 29cd618 + 0a25b80
commit aedb983
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,13 +58,13 @@ endif()
 
 execute_process(
   COMMAND git log -1 --format=%H
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_REVISION_C2A_CORE
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 execute_process(
   COMMAND git log -1 --format=%h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_REVISION_C2A_CORE_SHORT
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "c2a-core"
-version = "3.9.0-beta.7"
+version = "3.9.0-beta.8"
 edition = "2021"
 
 links = "c2a-core"

diff --git a/Examples/2nd_obc_user/CMakeLists.txt b/Examples/2nd_obc_user/CMakeLists.txt
@@ -41,13 +41,13 @@ endif()
 
 execute_process(
   COMMAND git log -1 --format=%H
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_REVISION_C2A_USER
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 execute_process(
   COMMAND git log -1 --format=%h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_REVISION_C2A_USER_SHORT
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )

diff --git a/Examples/minimum_user/CMakeLists.txt b/Examples/minimum_user/CMakeLists.txt
@@ -43,13 +43,13 @@ endif()
 
 execute_process(
   COMMAND git log -1 --format=%H
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_REVISION_C2A_USER
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 execute_process(
   COMMAND git log -1 --format=%h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_REVISION_C2A_USER_SHORT
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )

diff --git a/c2a_core_main.h b/c2a_core_main.h
@@ -10,6 +10,6 @@ void C2A_core_main(void);
 #define C2A_CORE_VER_MAJOR (3)
 #define C2A_CORE_VER_MINOR (9)
 #define C2A_CORE_VER_PATCH (0)
-#define C2A_CORE_VER_PRE   ("beta.7")
+#define C2A_CORE_VER_PRE   ("beta.8")
 
 #endif