From 4b449e1acbee862dfe70bbe4ed84ddfd40bea2b3 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Tue, 13 Oct 2020 15:27:43 +0200
Subject: [PATCH] new line meta with prefixes prefix instead of build_prefix
---
Application/src/GitSHA1.h | 2 +-
Application/src/tracker/misc/CMakeLists.txt | 2 +-
conda/meta.yaml | 7 +++++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Application/src/GitSHA1.h b/Application/src/GitSHA1.h
index 2eac607..cc993c5 100644
--- a/Application/src/GitSHA1.h
+++ b/Application/src/GitSHA1.h
@@ -1,3 +1,3 @@
extern const char g_GIT_SHA1[];
extern const char g_TREX_BUILD_TYPE[];
-extern const char g_TREX_BUILD_CXX_OPTIONS[];
\ No newline at end of file
+extern const char g_TREX_BUILD_CXX_OPTIONS[];
diff --git a/Application/src/tracker/misc/CMakeLists.txt b/Application/src/tracker/misc/CMakeLists.txt
index 278d53d..ec9abd7 100644
--- a/Application/src/tracker/misc/CMakeLists.txt
+++ b/Application/src/tracker/misc/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(tracker_misc PRIVATE
add_dependencies(tracker_misc TRex::OpenCV)
if(TREX_CONDA_PACKAGE_INSTALL)
- set(CONDA_PREFIX_VAR "$ENV{BUILD_PREFIX}")
+ set(CONDA_PREFIX_VAR "$ENV{PREFIX}")
string(REPLACE "\\" "\\\\" CONDA_PREFIX_VAR "${CONDA_PREFIX_VAR}")
target_compile_definitions(tracker_misc PRIVATE TREX_PYTHON_PATH="${CONDA_PREFIX_VAR}")
message(STATUS "Setting TREX_PYTHON_PATH=${CONDA_PREFIX_VAR}")
diff --git a/conda/meta.yaml b/conda/meta.yaml
index d53928c..5c3ee98 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -18,6 +18,13 @@ build:
ignore_run_exports:
- xorg-libxinerama
detect_binary_files_with_prefix: True
+ files_with_prefix:
+ - bin/trex
+ - bin/tgrabs
+ - bin/pvinfo
+ - bin/pvconvert
+ - bin/TRex.app/Contents/MacOS/TRex [osx]
+ - bin/TGrabs.app/Contents/MacOS/TGrabs [osx]
requirements:
build:
--
GitLab