diff --git a/CMakeLists.txt b/CMakeLists.txt index c6c99a7..5754ffb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,8 +224,13 @@ install( DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/ RENAME org.mavlink.qgroundcontrol.png ) +configure_file( + ${CMAKE_SOURCE_DIR}/deploy/org.mavlink.qgroundcontrol.metainfo.xml.in + ${CMAKE_BINARY_DIR}/metainfo/org.mavlink.qgroundcontrol.metainfo.xml + @ONLY +) install( - FILES ${CMAKE_SOURCE_DIR}/deploy/org.mavlink.qgroundcontrol.metainfo.xml + FILES ${CMAKE_BINARY_DIR}/metainfo/org.mavlink.qgroundcontrol.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo/ ) diff --git a/cmake/Git.cmake b/cmake/Git.cmake index c26b1da..df899be 100644 --- a/cmake/Git.cmake +++ b/cmake/Git.cmake @@ -23,3 +23,13 @@ execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE APP_VERSION_STR OUTPUT_STRIP_TRAILING_WHITESPACE) + +execute_process(COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE REL_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + +execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%aI ${REL_VERSION} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE REL_DATE + OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/deploy/org.mavlink.qgroundcontrol.metainfo.xml b/deploy/org.mavlink.qgroundcontrol.metainfo.xml.in similarity index 93% rename from deploy/org.mavlink.qgroundcontrol.metainfo.xml rename to deploy/org.mavlink.qgroundcontrol.metainfo.xml.in index 54fbf69..bba2d1c 100644 --- a/deploy/org.mavlink.qgroundcontrol.metainfo.xml +++ b/deploy/org.mavlink.qgroundcontrol.metainfo.xml.in @@ -24,6 +24,10 @@ + + + + org.mavlink.qgroundcontrol.desktop