summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-01-10 06:18:43 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-01-10 06:18:43 +0100
commit3265f4f14a8348072910c7c812b549064ecaa776 (patch)
treecb5a52aab5bd741bc9e6ad31a9ce93574783823d
parent0557e4ff5609f8863738847275ff19c96014b7be (diff)
cv, tracker/{aruco,pt}: link less opencv libs
-rw-r--r--cv/CMakeLists.txt3
-rw-r--r--cv/video-property-page.hpp2
-rw-r--r--cv/video-widget.hpp4
-rw-r--r--tracker-aruco/CMakeLists.txt3
-rw-r--r--tracker-aruco/include/arucofidmarkers.h2
-rw-r--r--tracker-aruco/include/cameraparameters.h2
-rw-r--r--tracker-aruco/include/marker.h2
-rw-r--r--tracker-aruco/include/markerdetector.h2
-rw-r--r--tracker-pt/CMakeLists.txt3
-rw-r--r--tracker-pt/camera.h2
10 files changed, 15 insertions, 10 deletions
diff --git a/cv/CMakeLists.txt b/cv/CMakeLists.txt
index 67a27ee9..61247634 100644
--- a/cv/CMakeLists.txt
+++ b/cv/CMakeLists.txt
@@ -1,6 +1,7 @@
find_package(OpenCV 3.0 QUIET COMPONENTS ${opencv-modules})
if(OpenCV_FOUND)
otr_module(cv STATIC)
- target_link_libraries(opentrack-cv ${OpenCV_LIBS})
+ set(modules opencv_core opencv_videoio)
+ target_link_libraries(opentrack-cv ${modules})
target_include_directories(opentrack-cv SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
endif()
diff --git a/cv/video-property-page.hpp b/cv/video-property-page.hpp
index a9eed7bf..b53993ef 100644
--- a/cv/video-property-page.hpp
+++ b/cv/video-property-page.hpp
@@ -6,7 +6,7 @@
# include <windows.h>
#endif
-#include "opencv2/videoio.hpp"
+#include <opencv2/videoio.hpp>
struct IBaseFilter;
diff --git a/cv/video-widget.hpp b/cv/video-widget.hpp
index 3b29ffc6..5dd70815 100644
--- a/cv/video-widget.hpp
+++ b/cv/video-widget.hpp
@@ -8,8 +8,10 @@
#pragma once
-#include <opencv2/core/core.hpp>
#include <memory>
+
+#include <opencv2/core.hpp>
+
#include <QObject>
#include <QWidget>
#include <QPainter>
diff --git a/tracker-aruco/CMakeLists.txt b/tracker-aruco/CMakeLists.txt
index 506c9bd1..95296848 100644
--- a/tracker-aruco/CMakeLists.txt
+++ b/tracker-aruco/CMakeLists.txt
@@ -3,7 +3,8 @@ if(OpenCV_FOUND)
set(SDK_ARUCO_LIBPATH "" CACHE FILEPATH "Aruco paper marker tracker static library path")
if(SDK_ARUCO_LIBPATH)
otr_module(tracker-aruco)
- target_link_libraries(opentrack-tracker-aruco opentrack-cv ${SDK_ARUCO_LIBPATH} ${OpenCV_LIBS})
+ set(modules opencv_core opencv_calib3d opencv_imgproc opencv_videoio)
+ target_link_libraries(opentrack-tracker-aruco opentrack-cv ${SDK_ARUCO_LIBPATH} ${opencv-modules})
target_include_directories(opentrack-tracker-aruco SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
endif()
endif()
diff --git a/tracker-aruco/include/arucofidmarkers.h b/tracker-aruco/include/arucofidmarkers.h
index 7dad4672..2577bf92 100644
--- a/tracker-aruco/include/arucofidmarkers.h
+++ b/tracker-aruco/include/arucofidmarkers.h
@@ -28,7 +28,7 @@ or implied, of Rafael Muñoz Salinas.
#ifndef ArucoFiducicalMarkerDetector_H
#define ArucoFiducicalMarkerDetector_H
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
#include "exports.h"
#include "marker.h"
#include "board.h"
diff --git a/tracker-aruco/include/cameraparameters.h b/tracker-aruco/include/cameraparameters.h
index 0a83deb2..0f0fd329 100644
--- a/tracker-aruco/include/cameraparameters.h
+++ b/tracker-aruco/include/cameraparameters.h
@@ -28,7 +28,7 @@ or implied, of Rafael Muñoz Salinas.
#ifndef _Aruco_CameraParameters_H
#define _Aruco_CameraParameters_H
#include "exports.h"
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
#include <string>
namespace aruco
diff --git a/tracker-aruco/include/marker.h b/tracker-aruco/include/marker.h
index 282e6a7d..360eae72 100644
--- a/tracker-aruco/include/marker.h
+++ b/tracker-aruco/include/marker.h
@@ -29,7 +29,7 @@ or implied, of Rafael Muñoz Salinas.
#define _Aruco_Marker_H
#include <vector>
#include <iostream>
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
#include "exports.h"
#include "cameraparameters.h"
namespace aruco {
diff --git a/tracker-aruco/include/markerdetector.h b/tracker-aruco/include/markerdetector.h
index edcad976..4e5f74c3 100644
--- a/tracker-aruco/include/markerdetector.h
+++ b/tracker-aruco/include/markerdetector.h
@@ -27,7 +27,7 @@ or implied, of Rafael Muñoz Salinas.
********************************/
#ifndef _ARUCO_MarkerDetector_H
#define _ARUCO_MarkerDetector_H
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
#include <cstdio>
#include <iostream>
#include "cameraparameters.h"
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt
index abc7fb33..8e6d902b 100644
--- a/tracker-pt/CMakeLists.txt
+++ b/tracker-pt/CMakeLists.txt
@@ -1,6 +1,7 @@
find_package(OpenCV 3.0 QUIET COMPONENTS ${opencv-modules})
if(OpenCV_FOUND)
otr_module(tracker-pt)
- target_link_libraries(opentrack-tracker-pt opentrack-cv ${OpenCV_LIBS})
+ set(modules opencv_core opencv_videoio opencv_imgproc)
+ 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/camera.h b/tracker-pt/camera.h
index 97dfa029..076e6847 100644
--- a/tracker-pt/camera.h
+++ b/tracker-pt/camera.h
@@ -15,7 +15,7 @@
#include "compat/util.hpp"
#include "compat/timer.hpp"
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
#include <opencv2/videoio.hpp>
#include <memory>