From 7e155de95128c665f5043b0606d44d81cab86180 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner Date: Wed, 3 Mar 2021 14:47:29 +0100 Subject: [PATCH 1/2] [ci] snapshot 2021-03-03 --- .gitlab-ci.yml | 3 ++- ci/prepare.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b27f1da..9f85152 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,7 @@ trigger biotracker/biotracker: trigger biotracker/backgroundsubtraction_tracker: stage: trigger only: - - master + - snapshot_20210303 trigger: project: bioroboticslab/biotracker/backgroundsubtraction_tracker + branch: snapshot_20210303 diff --git a/ci/prepare.py b/ci/prepare.py index 1f684e4..48a67c4 100755 --- a/ci/prepare.py +++ b/ci/prepare.py @@ -56,5 +56,5 @@ def extract_cmake_package(artifacts, name): for name, project, job in [ ("biotracker-interfaces", "bioroboticslab/biotracker/interfaces", job_stem), ]: - with fetch_artifacts(project, "master", job) as artifacts: + with fetch_artifacts(project, "snapshot_20210303", job) as artifacts: extract_cmake_package(artifacts, name) From 35dd235bdf6bd11c8a3e8340f21cb9b4720c8bc1 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner Date: Wed, 5 May 2021 10:43:04 +0200 Subject: [PATCH 2/2] Allow usage of cmake files from build tree --- CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cff54f..80a1a0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,11 +50,9 @@ install( DESTINATION ${INSTALL_CONFIGDIR} ) -install( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TrackerPlugin.cmake - DESTINATION ${INSTALL_CONFIGDIR}/Modules/${PROJECT_NAME} -) +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Modules/${PROJECT_NAME}) +configure_file(cmake/TrackerPlugin.cmake Modules/${PROJECT_NAME} COPYONLY) +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Modules DESTINATION "${INSTALL_CONFIGDIR}") set(CPACK_GENERATOR "TXZ") set(CPACK_PACKAGE_VERSION "${SOURCE_VERSION}")