Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PeTrack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pedestrian Dynamics Empiricism
PeTrack
Commits
74008502
Commit
74008502
authored
4 years ago
by
Schrödter, Tobias
Browse files
Options
Downloads
Plain Diff
Merge branch '12-compile-libelas-as-static-library' into 'master'
Compiling libelas as static library Closes
#12
See merge request
!6
parents
90c39668
931de1e8
No related branches found
No related tags found
1 merge request
!6
Compiling libelas as static library
Pipeline
#24543
passed
4 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+6
-3
6 additions, 3 deletions
CMakeLists.txt
with
6 additions
and
3 deletions
CMakeLists.txt
+
6
−
3
View file @
74008502
...
...
@@ -50,7 +50,7 @@ print_var(STEREO)
option
(
AVI
"Use Avi File from Point Grey (currently not supported)"
OFF
)
print_var
(
AVI
)
option
(
LIBELAS
"Use Libelas"
O
N
)
option
(
LIBELAS
"Use Libelas"
O
FF
)
print_var
(
LIBELAS
)
option
(
DISABLE_STEREO
"Disable Stereo features (currently must be taken)"
ON
)
...
...
@@ -156,7 +156,7 @@ add_executable(petrack src/main.cpp)
target_link_libraries
(
petrack PRIVATE petrack_core
)
# TODO we should remove this compile option and be more strict
target_compile_options
(
petrack_core PRIVATE
"-fpermissive"
${
COMMON_COMPILE_OPTIONS
}
)
target_compile_options
(
petrack_core PRIVATE
${
COMMON_COMPILE_OPTIONS
}
)
target_compile_definitions
(
petrack_core PUBLIC STEREO_DISABLED
)
#**********************************************************
...
...
@@ -205,13 +205,16 @@ target_sources(petrack_core PRIVATE src/analysePlot.cpp)
#*************************************************************
if
(
LIBELAS
)
target_compile_definitions
(
petrack_core PRIVATE LIBELAS
)
target_sources
(
petrack_core PRIVATE
add_library
(
elas STATIC
src/libelas/elasDescriptor.cpp
src/libelas/elas.cpp
src/libelas/elasFilter.cpp
src/libelas/elasMatrix.cpp
src/libelas/elasTriangle.cpp
)
target_include_directories
(
elas PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/include
)
target_compile_options
(
elas PRIVATE
"-fpermissive"
)
target_link_libraries
(
petrack_core PRIVATE elas
)
endif
(
LIBELAS
)
# TODO currently not available
...
...
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