diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fc4c10bc6b7cf50dddbec18b02e46244bf40818..1f06e3dd2824316bec2b55cc33ba04b01aaf8540 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 ea0e4398e6d619044cfb7137185a35a4519d4191..b4675eb677075675825ccdb4eec5b570b1090370 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 c8e00e098a1ba0f66b667d9f45fc5f67561a8f01..8e6b18bd27d0e36e00ae7e94a912bc0d88f5b20f 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 9e37a47a3ce18f6635889f974371aaf659eb4e0e..e5902689f75c6c0fb8869af7272dc2eb0d89096e 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 341cf11faf9a29504168de4e54beaad182c5adc5..0000000000000000000000000000000000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.2.0 \ No newline at end of file