diff options
| -rw-r--r-- | tracker-pt/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tracker-pt/export.hpp | 14 | ||||
| -rw-r--r-- | tracker-pt/module.cxx (renamed from tracker-pt/module.cpp) | 0 |
3 files changed, 13 insertions, 6 deletions
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt index aa4c89f6..a02bdfe0 100644 --- a/tracker-pt/CMakeLists.txt +++ b/tracker-pt/CMakeLists.txt @@ -1,7 +1,10 @@ find_package(OpenCV 3.0 QUIET) if(OpenCV_FOUND) - otr_module(tracker-pt) + otr_module(tracker-pt-base STATIC) + target_include_directories(opentrack-tracker-pt-base SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) + set(modules opencv_core opencv_videoio opencv_imgproc) + otr_module(tracker-pt SOURCES module.cxx) target_link_libraries(opentrack-tracker-pt opentrack-cv ${modules}) target_include_directories(opentrack-tracker-pt SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) endif() diff --git a/tracker-pt/export.hpp b/tracker-pt/export.hpp index a733c9fe..cef63f83 100644 --- a/tracker-pt/export.hpp +++ b/tracker-pt/export.hpp @@ -2,10 +2,14 @@ #pragma once -#include "compat/linkage-macros.hpp" - -#ifdef BUILD_TRACKER_PT -# define OTR_PT_EXPORT OTR_GENERIC_EXPORT +#if 0 +# include "compat/linkage-macros.hpp" +# ifdef BUILD_TRACKER_PT +# define OTR_PT_EXPORT OTR_GENERIC_EXPORT +# else +# define OTR_PT_EXPORT OTR_GENERIC_IMPORT +# endif #else -# define OTR_PT_EXPORT OTR_GENERIC_IMPORT +// static link +# define OTR_PT_EXPORT #endif diff --git a/tracker-pt/module.cpp b/tracker-pt/module.cxx index 5c298ca5..5c298ca5 100644 --- a/tracker-pt/module.cpp +++ b/tracker-pt/module.cxx |