diff options
| author | FormerLurker <hochgebe@gmail.com> | 2020-11-28 19:57:52 +0300 |
|---|---|---|
| committer | FormerLurker <hochgebe@gmail.com> | 2020-11-28 19:57:52 +0300 |
| commit | af8ed910df9a542cb6b1585bcf03a276af16a714 (patch) | |
| tree | 5c41297ac22fc41d2a4a8b9f06b811766abb7a0f /GcodeProcessorLib | |
| parent | a63b13b326774d97856d55976daff6e6048b07bb (diff) | |
Try to make git tags work.
Diffstat (limited to 'GcodeProcessorLib')
| -rw-r--r-- | GcodeProcessorLib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | GcodeProcessorLib/deploy/version.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/GcodeProcessorLib/CMakeLists.txt b/GcodeProcessorLib/CMakeLists.txt index 4ed0251..84629f8 100644 --- a/GcodeProcessorLib/CMakeLists.txt +++ b/GcodeProcessorLib/CMakeLists.txt @@ -7,7 +7,7 @@ project(GcodeProcessorLib C CXX) # First get the current branch and store to GIT_BRANCH variable execute_process( COMMAND git rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GIT_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -15,7 +15,7 @@ execute_process( # get the current commit version execute_process( COMMAND git log -1 --format=%h - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -23,7 +23,7 @@ execute_process( # get the tag for the current branch execute_process( COMMAND git describe --abbrev=0 - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GIT_TAG OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -31,7 +31,7 @@ execute_process( # get the most recent tagged version execute_process( COMMAND git describe - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GIT_TAGGED_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) diff --git a/GcodeProcessorLib/deploy/version.h b/GcodeProcessorLib/deploy/version.h index 10f2b57..f687e29 100644 --- a/GcodeProcessorLib/deploy/version.h +++ b/GcodeProcessorLib/deploy/version.h @@ -3,10 +3,10 @@ #ifndef VERSION_GENERATED_H #define VERSION_GENERATED_H #define GIT_BRANCH "devel" - #define GIT_COMMIT_HASH "f89e306" - #define GIT_TAGGED_VERSION "0.1.0-12-gf89e306" + #define GIT_COMMIT_HASH "a63b13b" + #define GIT_TAGGED_VERSION "0.1.0-13-ga63b13b" #define GIT_TAG "0.1.0" - #define BUILD_DATE "2020-11-28T16:49:35Z" + #define BUILD_DATE "2020-11-28T16:56:32Z" #define COPYRIGHT_DATE "2020" #define AUTHOR "Brad Hochgesang" #endif |