Merge pull request #633 from Dronecode/fix-versioning

core/backend: back to version tags

CMakeLists.txt

@@ -43,14 +43,16 @@ endif()
 set(dronecode_sdk_install_include_dir "include/dronecode_sdk")
 set(dronecode_sdk_install_lib_dir ${lib_path})
 
-file (STRINGS "${PROJECT_SOURCE_DIR}/version" VERSION_STR)
-message(STATUS "Read version: ${VERSION_STR}")
+execute_process(
+    COMMAND git describe --abbrev=8 --dirty --always --tags
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE VERSION_STR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+message(STATUS "Version: ${VERSION_STR}")
 add_definitions(-DDRONECODE_SDK_VERSION="${VERSION_STR}")
 
-add_custom_target(version
-    COMMAND :
-    DEPENDS ${PROJECT_SOURCE_DIR}/version)
-
 add_subdirectory(core)
 add_subdirectory(plugins)
 

backend/src/CMakeLists.txt

@@ -34,8 +34,6 @@ else()
     add_library(backend STATIC ${BACKEND_SOURCES})
 endif()
 
-add_dependencies(dronecode_sdk version)
-
 target_link_libraries(backend
     dronecode_sdk
     dronecode_sdk_action

core/CMakeLists.txt

@@ -12,6 +12,9 @@ else()
     set(LIBRARY_TYPE "SHARED")
 endif()
 
+
+configure_file(version.h.in version.h)
+
 add_library(dronecode_sdk ${LIBRARY_TYPE}
     call_every_handler.cpp
     connection.cpp
@@ -36,8 +39,6 @@ add_library(dronecode_sdk ${LIBRARY_TYPE}
     thread_pool.cpp
 )
 
-add_dependencies(dronecode_sdk version)
-
 target_link_libraries(dronecode_sdk
     ${CMAKE_THREAD_LIBS_INIT}
     ${CURL_LIBRARY}

core/dronecode_sdk_impl.cpp

@@ -10,6 +10,7 @@
 #include "system_impl.h"
 #include "serial_connection.h"
 #include "cli_arg.h"
+#include "version.h"
 
 namespace dronecode_sdk {
 
@@ -21,7 +22,7 @@ DronecodeSDKImpl::DronecodeSDKImpl() :
     _on_discover_callback(nullptr),
     _on_timeout_callback(nullptr)
 {
-    LogInfo() << "DronecodeSDK version: " << DRONECODE_SDK_VERSION;
+    LogInfo() << "DronecodeSDK version: " << dronecode_sdk_version;
 }
 
 DronecodeSDKImpl::~DronecodeSDKImpl()