cmake: use version from git tag for Debian package

mavlink · Jul 16, 2020 · 19bcb99 · 19bcb99
1 parent 6011c5a
commit 19bcb99
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,25 @@
 cmake_minimum_required(VERSION 3.1)
 
-set(MAVSDK_VERSION_MAJOR 0)
-set(MAVSDK_VERSION_MINOR 28)
-set(MAVSDK_VERSION_PATCH 0)
+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}")
+STRING(REGEX REPLACE v\([0-9]+\).[0-9]+.[0-9]+.*$ \\1 MAVSDK_VERSION_MAJOR "${VERSION_STR}")
+STRING(REGEX REPLACE v[0-9]+.\([0-9]+\).[0-9]+.*$ \\1 MAVSDK_VERSION_MINOR "${VERSION_STR}")
+STRING(REGEX REPLACE v[0-9]+.[0-9]+.\([0-9]+\).*$ \\1 MAVSDK_VERSION_PATCH "${VERSION_STR}")
+
+message(STATUS "Version major: ${MAVSDK_VERSION_MAJOR}")
+message(STATUS "Version minor: ${MAVSDK_VERSION_MINOR}")
+message(STATUS "Version patch: ${MAVSDK_VERSION_PATCH}")
+
 set(MAVSDK_SOVERSION_STRING ${MAVSDK_VERSION_MAJOR})
 set(MAVSDK_VERSION_STRING ${MAVSDK_VERSION_MAJOR}.${MAVSDK_VERSION_MINOR}.${MAVSDK_VERSION_PATCH})
 
-# Extract command line args into ${CL_ARGS} in order to propagate them to the superbuild dependencies 
+# Extract command line args into ${CL_ARGS} in order to propagate them to the superbuild dependencies
 get_cmake_property(vars CACHE_VARIABLES)
 foreach(var ${vars})
   get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -50,16 +50,6 @@ endif()
 set(mavsdk_install_include_dir "include/mavsdk")
 set(mavsdk_install_lib_dir ${lib_path})
 
-execute_process(
-    COMMAND git describe --abbrev=8 --dirty --always --tags
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    OUTPUT_VARIABLE VERSION_STR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-STRING(REGEX REPLACE v\([0-9]+.[0-9]+.[0-9]+.*$\) \\1 VERSION_STR "${VERSION_STR}")
-message(STATUS "Version: ${VERSION_STR}")
-
 add_subdirectory(core)
 add_subdirectory(plugins)