From 5f2823b647fcdf8a04a2750fca65b09e210b23ed Mon Sep 17 00:00:00 2001 From: mmiesch Date: Fri, 4 Jun 2021 17:18:46 -0600 Subject: [PATCH 1/2] bump version number --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index abeb0d6..8e5f3a3 100644 --- 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}) From 4479d1554cd4ef77fc4cefaca8537090359f8654 Mon Sep 17 00:00:00 2001 From: mmiesch Date: Sat, 12 Jun 2021 12:45:22 -0600 Subject: [PATCH 2/2] bugfix in branch path --- cmake/Functions/git_functions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Functions/git_functions.cmake b/cmake/Functions/git_functions.cmake index 1eb7453..996e500 100644 --- a/cmake/Functions/git_functions.cmake +++ b/cmake/Functions/git_functions.cmake @@ -7,7 +7,7 @@ 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 ) @@ -15,7 +15,7 @@ function( find_branch_name ) 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 )