Allow external setting of GIT_VERSION

Author: baranyaib90

CMakeLists.txt

@@ -35,6 +35,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments -Wno-
 endif()
 
 # VERSION
+# It is possible to define external default value like: cmake -DSW_VERSION=1.2-custom
 
 find_package(Git)
 if(Git_FOUND)
@@ -43,17 +44,27 @@ if(Git_FOUND)
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE GIT_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  message(STATUS "Version: ${GIT_VERSION}")
+
+  if(GIT_VERSION)
+    set(SW_VERSION "${GIT_VERSION}")
+  else()
+    message(WARNING "Could not find out version from git command!")
+  endif()
 
   # May not update version in some cases (example: git commit --amend)
   set_property(GLOBAL APPEND
     PROPERTY CMAKE_CONFIGURE_DEPENDS
     "${CMAKE_SOURCE_DIR}/.git/index")
 else()
-  set(GIT_VERSION "UNKNOWN")
-  message(WARNING "Could not find git command! Version is set to: ${GIT_VERSION}")
+  message(WARNING "Could not find git command!")
+endif()
+
+if(NOT SW_VERSION)
+  set(SW_VERSION "UNKNOWN")
 endif()
 
+message(STATUS "Version is set to: ${SW_VERSION}")
+
 # LIBRARY DEPENDENCIES
 
 find_path(LIBCARES_INCLUDE_DIR ares.h)
@@ -100,8 +111,8 @@ set_property(TARGET ${TARGET_NAME} PROPERTY C_STANDARD 11)
 define_file_basename_for_sources("https_dns_proxy")
 
 set_source_files_properties(
-  src/main.c src/options.c
-  PROPERTIES COMPILE_FLAGS "-DGIT_VERSION='\"${GIT_VERSION}\"'")
+  src/options.c
+  PROPERTIES COMPILE_FLAGS "-DSW_VERSION='\"${SW_VERSION}\"'")
 
 if(CLANG_TIDY_EXE)
   set_target_properties(

src/main.c

@@ -216,8 +216,8 @@ int main(int argc, char *argv[]) {
 
   logging_init(opt.logfd, opt.loglevel);
 
-  ILOG("Version " GIT_VERSION);
-  ILOG("Built "__DATE__" "__TIME__".");
+  ILOG("Version: %s", options_sw_version());
+  ILOG("Built: " __DATE__ " " __TIME__);
   ILOG("System c-ares: %s", ares_version(NULL));
   ILOG("System libcurl: %s", curl_version());
 

src/options.c

@@ -17,6 +17,15 @@
 
 #define DEFAULT_HTTP_VERSION 2
 
+
+const char * options_sw_version() {
+#ifdef SW_VERSION
+  return SW_VERSION;
+#else
+  return "UNKNOWN";
+#endif
+}
+
 void options_init(struct Options *opt) {
   opt->listen_addr = "127.0.0.1";
   opt->listen_port = 5053;
@@ -107,7 +116,7 @@ int options_parse_args(struct Options *opt, int argc, char **argv) {
     case 'h':
       return -1;
     case 'V': // version
-      printf("%s\n", GIT_VERSION);
+      printf("%s\n", options_sw_version());
       exit(0);
     default:
       printf("Unknown state!");

src/options.h

@@ -57,6 +57,7 @@ typedef struct Options options_t;
 #ifdef __cplusplus
 extern "C" {
 #endif
+const char * options_sw_version();
 void options_init(struct Options *opt);
 int options_parse_args(struct Options *opt, int argc, char **argv);
 void options_show_usage(int argc, char **argv);