diff --git a/CMakeLists.txt b/CMakeLists.txt index ac46bf4..8fc8c4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,25 +34,14 @@ set(COMPANY "Mavlink") set(COPYRIGHT "Copyright (c) 2018 QGroundControl. All rights reserved.") set(IDENTIFIER "io.mavlink.qgroundcontrol") -execute_process( - COMMAND git submodule update --init - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - -execute_process( - COMMAND git describe --always --tags - OUTPUT_VARIABLE git_tag - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - add_definitions( -DQGC_APPLICATION_NAME="QGroundControl" -DQGC_ORG_NAME="QGroundControl.org" -DQGC_ORG_DOMAIN="org.qgroundcontrol" ) -message(STATUS "QGroundControl version: ${git_tag}") +include(Git) +message(STATUS "QGroundControl version: ${GIT_VERSION}") #============================================================================= # ccache diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e3d1a6..0dff558 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -106,7 +106,7 @@ add_library(qgc TerrainTile.cc ) -set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}") +set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${GIT_VERSION}") add_subdirectory(ui)