]> git.seodisparate.com - SimpleArchiver/commitdiff
Update CMakeLists.txt to fix version when no .git
authorStephen Seo <seo.disparate@gmail.com>
Tue, 28 Jan 2025 05:21:55 +0000 (14:21 +0900)
committerStephen Seo <seo.disparate@gmail.com>
Tue, 28 Jan 2025 05:22:14 +0000 (14:22 +0900)
If building from extracted archive instead of git clone, defer version
to builtin.

CMakeLists.txt

index 441b3bda99425e51e2fddaac75848de1982f8bb8..9886214d758e8ef3e4abacf2aa862428b58a70ac 100644 (file)
@@ -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