From 34ec15976de2690b657ec0991a5421a78f2d2b3b Mon Sep 17 00:00:00 2001 From: Richard Giliam Date: Tue, 6 Aug 2024 13:17:34 -0700 Subject: [PATCH 1/2] Fix mechanism for getting package version, when git is not present --- CMakeLists.txt | 3 ++- cmake/VersionHeader.cmake | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8bbb82..9b86834 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,13 +53,14 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "Profiling") endif() ## ion-c Build Version -set(IONC_FULL_VERSION ${CMAKE_PROJECT_VERSION}) +set(IONC_FULL_VERSION "v${CMAKE_PROJECT_VERSION}-0-g000000") find_program(GIT_EXECUTABLE "git") add_custom_target( version ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/build_version.h.in -D DST=${CMAKE_CURRENT_BINARY_DIR}/build_version.h -D GIT_EXECUTABLE=${GIT_EXECUTABLE} + -D IONC_FULL_VERSION=${IONC_FULL_VERSION} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VersionHeader.cmake ) diff --git a/cmake/VersionHeader.cmake b/cmake/VersionHeader.cmake index 2bdcd36..c05e291 100644 --- a/cmake/VersionHeader.cmake +++ b/cmake/VersionHeader.cmake @@ -1,4 +1,3 @@ -set(IONC_FULL_VERSION "${CMAKE_PROJECT_VERSION}") if (GIT_EXECUTABLE) execute_process( COMMAND ${GIT_EXECUTABLE} describe --long --tags --dirty --match "v*" From 4aa87b5ee328ee3d283cd95456b7e05c44cc2f71 Mon Sep 17 00:00:00 2001 From: Richard Giliam Date: Tue, 6 Aug 2024 15:00:41 -0700 Subject: [PATCH 2/2] Add comment to explain formatting of version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b86834..5fadb6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "Profiling") endif() ## ion-c Build Version -set(IONC_FULL_VERSION "v${CMAKE_PROJECT_VERSION}-0-g000000") +set(IONC_FULL_VERSION "v${CMAKE_PROJECT_VERSION}-0-g000000") # Format cmake project version to match git describe output find_program(GIT_EXECUTABLE "git") add_custom_target( version