Merge pull request #8 from JCSDA-internal/release/1.1.0

Release/1.1.0
JCSDA · Jun 15, 2021 · d53912f · d53912f
2 parents 9e68442 + 4479d15
commit d53912f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 
 cmake_minimum_required( VERSION 3.12 )
-project( jedicmake VERSION 1.0.1 DESCRIPTION "JEDI CMake Toolkit" )
+project( jedicmake VERSION 1.1.0 DESCRIPTION "JEDI CMake Toolkit" )
 
 include(GNUInstallDirs)
 set(JEDI_MODULES_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})

diff --git a/cmake/Functions/git_functions.cmake b/cmake/Functions/git_functions.cmake
@@ -7,15 +7,15 @@ function( find_branch_name )
 
   execute_process(
     COMMAND bash "-c" "git symbolic-ref -q --short HEAD"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${_p_REPO_DIR_NAME}"
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/${_p_REPO_DIR_NAME}"
     OUTPUT_VARIABLE GIT_BRANCH
 		ERROR_QUIET
     OUTPUT_STRIP_TRAILING_WHITESPACE )
   set( GIT_BRANCH_FUNC ${GIT_BRANCH} PARENT_SCOPE )
 
 	execute_process(
     COMMAND bash "-c" "git describe --tags --exact-match"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${_p_REPO_DIR_NAME}"
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/${_p_REPO_DIR_NAME}"
     OUTPUT_VARIABLE GIT_TAGS
 		ERROR_QUIET
     OUTPUT_STRIP_TRAILING_WHITESPACE )