summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-01-10 07:51:20 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-01-10 07:51:20 +0100
commit4e03507d73eeb58b09a10176c2713b3262a0463a (patch)
tree81f88b3af0447251b61ee7383511bbb56728996c
parent9fa8c576c37095a77e20a34b37e087fcc6cc3885 (diff)
cmake: always link opencv components explicitly
-rw-r--r--cmake/opentrack-platform.cmake2
-rw-r--r--cv/CMakeLists.txt2
-rw-r--r--tracker-pt/CMakeLists.txt2
3 files changed, 2 insertions, 4 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index f927a9ea..88e8a5dd 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -154,5 +154,3 @@ endif()
if(UNIX AND NOT APPLE)
include(FindPkgConfig)
endif()
-
-set(opencv-modules opencv_calib3d opencv_core opencv_features2d opencv_imgcodecs opencv_imgproc opencv_objdetect opencv_videoio)
diff --git a/cv/CMakeLists.txt b/cv/CMakeLists.txt
index 68d7e365..a3f05162 100644
--- a/cv/CMakeLists.txt
+++ b/cv/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenCV 3.0 QUIET COMPONENTS ${opencv-modules})
+find_package(OpenCV 3.0 QUIET)
if(OpenCV_FOUND)
otr_module(cv STATIC)
target_include_directories(opentrack-cv SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS})
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt
index 8e6d902b..aa4c89f6 100644
--- a/tracker-pt/CMakeLists.txt
+++ b/tracker-pt/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenCV 3.0 QUIET COMPONENTS ${opencv-modules})
+find_package(OpenCV 3.0 QUIET)
if(OpenCV_FOUND)
otr_module(tracker-pt)
set(modules opencv_core opencv_videoio opencv_imgproc)