Skip to content
Snippets Groups Projects
Commit 74008502 authored by Schrödter, Tobias's avatar Schrödter, Tobias
Browse files

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!6Compiling libelas as static library
Pipeline #24543 passed
......@@ -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" ON)
option(LIBELAS "Use Libelas" OFF)
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment