diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-05-06 03:52:45 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-05-06 03:53:01 +0200 |
| commit | 31bab22b5ee7bc18ad4bdb2fb74ed4948a900cc0 (patch) | |
| tree | 7532ffae7542002136e94f217fa3596787f0cc0a | |
| parent | c246ff0280eda1a8ccdfdfb557037b7cea8ecc63 (diff) | |
compat/camera-names: move to original location
Issue: #946
| -rw-r--r-- | compat/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | compat/camera-names.cpp (renamed from video-opencv/camera-names.cpp) | 0 | ||||
| -rw-r--r-- | compat/camera-names.hpp (renamed from video-opencv/camera-names.hpp) | 4 | ||||
| -rw-r--r-- | tracker-kinect-face/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tracker-kinect-face/camera_kinect_ir.cpp | 2 | ||||
| -rw-r--r-- | video-opencv/impl-metadata.cpp | 2 | ||||
| -rw-r--r-- | video-opencv/video-property-page.cpp | 4 |
7 files changed, 11 insertions, 12 deletions
diff --git a/compat/CMakeLists.txt b/compat/CMakeLists.txt index 3fddefb4..5ef9ab67 100644 --- a/compat/CMakeLists.txt +++ b/compat/CMakeLists.txt @@ -1,7 +1,11 @@ otr_module(compat NO-COMPAT BIN) if(NOT WIN32 AND NOT APPLE) - target_link_libraries(opentrack-compat rt) + target_link_libraries(${self} rt) +endif() + +if(WIN32) + target_link_libraries(${self} strmiids) endif() if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/video-opencv/camera-names.cpp b/compat/camera-names.cpp index 69926e5a..69926e5a 100644 --- a/video-opencv/camera-names.cpp +++ b/compat/camera-names.cpp diff --git a/video-opencv/camera-names.hpp b/compat/camera-names.hpp index 9f0883f5..bda15e81 100644 --- a/video-opencv/camera-names.hpp +++ b/compat/camera-names.hpp @@ -13,6 +13,6 @@ #include "export.hpp" -std::vector<QString> get_camera_names(); -int camera_name_to_index(const QString &name); +OTR_COMPAT_EXPORT std::vector<QString> get_camera_names(); +OTR_COMPAT_EXPORT int camera_name_to_index(const QString &name); diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt index 31b52ff7..7ab62df2 100644 --- a/tracker-kinect-face/CMakeLists.txt +++ b/tracker-kinect-face/CMakeLists.txt @@ -7,9 +7,6 @@ if (WIN32 AND opentrack-intel) # Register our module otr_module(tracker-kinect-face) - target_sources(${self} PUBLIC "../video-opencv/camera-names.cpp") - target_link_libraries(${self} strmiids) - if(MSVC) # workaround warning in SDK target_compile_options(${self} PRIVATE "-wd4471") @@ -54,7 +51,5 @@ if (WIN32 AND opentrack-intel) target_include_directories(${self} SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) target_link_libraries(${self} opencv_imgproc opentrack-cv opencv_core opentrack-video) endif() - - endif() endif() diff --git a/tracker-kinect-face/camera_kinect_ir.cpp b/tracker-kinect-face/camera_kinect_ir.cpp index 75945d49..81357a6d 100644 --- a/tracker-kinect-face/camera_kinect_ir.cpp +++ b/tracker-kinect-face/camera_kinect_ir.cpp @@ -14,7 +14,7 @@ #include "compat/sleep.hpp" #include "compat/math-imports.hpp" -#include "video-opencv/camera-names.hpp" +#include "compat/camera-names.hpp" #include <opencv2/imgproc.hpp> #include <cstdlib> diff --git a/video-opencv/impl-metadata.cpp b/video-opencv/impl-metadata.cpp index 84b11822..48a2e693 100644 --- a/video-opencv/impl-metadata.cpp +++ b/video-opencv/impl-metadata.cpp @@ -1,5 +1,5 @@ #include "impl.hpp" -#include "camera-names.hpp" +#include "compat/camera-names.hpp" #include "video-property-page.hpp" namespace opencv_camera_impl { diff --git a/video-opencv/video-property-page.cpp b/video-opencv/video-property-page.cpp index 078898a5..8057bf9e 100644 --- a/video-opencv/video-property-page.cpp +++ b/video-opencv/video-property-page.cpp @@ -9,7 +9,7 @@ #ifdef _WIN32 -#include "camera-names.hpp" +#include "compat/camera-names.hpp" #include "compat/sleep.hpp" #include "compat/run-in-thread.hpp" #include "compat/library-path.hpp" @@ -149,7 +149,7 @@ bool video_property_page::show(int idx) #elif defined(__linux) # include <QProcess> -# include "camera-names.hpp" +# include "compat/camera-names.hpp" bool video_property_page::show(int idx) { |