From b2a610c4164332af1b944f7db74d215b25baf34f Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Tue, 28 Jan 2025 14:21:55 +0900 Subject: [PATCH] Update CMakeLists.txt to fix version when no .git If building from extracted archive instead of git clone, defer version to builtin. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 441b3bd..9886214 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,11 @@ if(IS_EXECUTABLE /usr/bin/git) execute_process(COMMAND /usr/bin/git describe --long --tags WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" OUTPUT_VARIABLE SIMPLE_ARCHIVER_GIT_VER + ERROR_VARIABLE SIMPLE_ARCHIVER_GIT_VER_ERROR OUTPUT_STRIP_TRAILING_WHITESPACE) + if (NOT SIMPLE_ARCHIVER_GIT_VER) + set(SIMPLE_ARCHIVER_GIT_VER "${SimpleArchiver_VERSION}") + endif() message("Got version \"${SIMPLE_ARCHIVER_GIT_VER}\"") set_source_files_properties(src/parser.c PROPERTIES -- 2.49.0