From 3265f4f14a8348072910c7c812b549064ecaa776 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 10 Jan 2018 06:18:43 +0100
Subject: cv, tracker/{aruco,pt}: link less opencv libs

---
 tracker-aruco/CMakeLists.txt             | 3 ++-
 tracker-aruco/include/arucofidmarkers.h  | 2 +-
 tracker-aruco/include/cameraparameters.h | 2 +-
 tracker-aruco/include/marker.h           | 2 +-
 tracker-aruco/include/markerdetector.h   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'tracker-aruco')

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"
-- 
cgit v1.2.3