Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
trex
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
swp21_biotracker
trex
Commits
4b449e1a
Commit
4b449e1a
authored
4 years ago
by
Tristan Walter
Browse files
Options
Downloads
Patches
Plain Diff
new line
meta with prefixes prefix instead of build_prefix
parent
c4751b7b
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Application/src/GitSHA1.h
+1
-1
1 addition, 1 deletion
Application/src/GitSHA1.h
Application/src/tracker/misc/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Application/src/tracker/misc/CMakeLists.txt
conda/meta.yaml
+7
-0
7 additions, 0 deletions
conda/meta.yaml
with
9 additions
and
2 deletions
Application/src/GitSHA1.h
+
1
−
1
View file @
4b449e1a
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
[];
This diff is collapsed.
Click to expand it.
Application/src/tracker/misc/CMakeLists.txt
+
1
−
1
View file @
4b449e1a
...
...
@@ -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
}
"
)
...
...
This diff is collapsed.
Click to expand it.
conda/meta.yaml
+
7
−
0
View file @
4b449e1a
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment