From 2149821e69e92546fd35a316b5aada6276c98c94 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Tue, 25 Feb 2020 15:17:19 +0100
Subject: [PATCH] Update use of (git) source version
---
CMakeLists.txt | 13 ++++++-------
Src/BioTrackerPlugin.json.in | 2 +-
Src/CMakeLists.txt | 3 ---
Src/plugin.json.in | 2 +-
VERSION | 1 -
5 files changed, 8 insertions(+), 13 deletions(-)
delete mode 100644 VERSION
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fc4c10..1f06e3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +1,22 @@
cmake_minimum_required(VERSION 3.13)
-file(READ VERSION PROJECT_VERSION)
+exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --dirty --always --exclude '*'" OUTPUT_VARIABLE SOURCE_VERSION)
-project(biotracker-lucaskanade.bio_tracker)
+project(biotracker-background_subtraction_tracker
+ LANGUAGES CXX
+)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
option(PACKAGE_WINDOWS_MSI "Create .msi package" OFF)
endif()
option(PACKAGE_TXZ "Create .tar.xz package" OFF)
-find_package(biotracker-utility 0.2 REQUIRED)
+find_package(biotracker-utility REQUIRED)
add_subdirectory(Src)
include(cmake/Locate.cmake)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
- install(TARGETS ${target} DESTINATION .)
-
option(INSTALL_REQUIRED_SYSTEM_LIBRARIES "Install required system libraries" OFF)
if(INSTALL_REQUIRED_SYSTEM_LIBRARIES)
set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
@@ -38,8 +38,7 @@ endif()
set(CPACK_PACKAGE_NAME "BioTracker Plugin BackgroundSubtraction")
set(CPACK_PACKAGE_VENDOR "Biorobotics Lab / FU Berlin")
-
-set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+set(CPACK_PACKAGE_VERSION ${SOURCE_VERSION})
if(PACKAGE_WINDOWS_MSI)
set(CPACK_GENERATOR "WIX")
diff --git a/Src/BioTrackerPlugin.json.in b/Src/BioTrackerPlugin.json.in
index ea0e439..b4675eb 100644
--- a/Src/BioTrackerPlugin.json.in
+++ b/Src/BioTrackerPlugin.json.in
@@ -1,6 +1,6 @@
{ "type" : "TrackingPlugin",
"name" : "Background Subtraction Tracker",
"longname" : "some long name",
- "version" : "CURRENT_GIT_HASH",
+ "version" : "SOURCE_VERSION",
"dependencies" : []
}
diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
index c8e00e0..8e6b18b 100644
--- a/Src/CMakeLists.txt
+++ b/Src/CMakeLists.txt
@@ -2,9 +2,6 @@
#### Biotracker: backgroundSubtraction
##############################################################
-include(biotracker-utility/VSSugar)
-VSSourceGroups(${CMAKE_CURRENT_LIST_DIR})
-
include(biotracker-utility/TrackerPlugin)
set(target biotracker-backgroundSubtraction.bio_tracker)
diff --git a/Src/plugin.json.in b/Src/plugin.json.in
index 9e37a47..e590268 100644
--- a/Src/plugin.json.in
+++ b/Src/plugin.json.in
@@ -1,6 +1,6 @@
{ "type" : "TrackingPlugin",
"name" : "Background Subtraction Tracker",
"longname" : "some long name",
- "version" : "@CURRENT_GIT_HASH@",
+ "version" : "@SOURCE_VERSION@",
"dependencies" : []
}
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 341cf11..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.2.0
\ No newline at end of file
--
GitLab