diff --git a/Application/src/GitSHA1.h b/Application/src/GitSHA1.h index 2eac60798debfca4ef2ca3fb24e925c10e224ef5..cc993c585c9258322fe68e2c6fa14bd11b319d20 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 278d53dd67c34c029823d5d74fc61154ea3b893c..ec9abd747a2a4d8fab2ee7e69066377664694ec5 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 d53928ce48fd4b5c1df5c85b0eed7a9442fe7b12..5c3ee9879bd5e11b1628caf4be6c8a20eb752602 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: