From 6943826f39ff644882ad8f4b7a6c298f114306d5 Mon Sep 17 00:00:00 2001
From: Manuel Grizonnet <manuel.grizonnet@cnes.fr>
Date: Thu, 30 Mar 2017 16:02:14 +0200
Subject: [PATCH] BUG: if opencv_dir is set just search include directory in
opencv_dir/../../
---
CMake/FindOpenCV.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMake/FindOpenCV.cmake b/CMake/FindOpenCV.cmake
index 7d41943437..f14c205df4 100644
--- a/CMake/FindOpenCV.cmake
+++ b/CMake/FindOpenCV.cmake
@@ -30,6 +30,8 @@ if(OpenCV_DIR)
opencv_INCLUDE_DIR
opencv/cv.h
PATHS "${OPENCV_SEARCH_PATH}"
+ #no additional paths are added to the search if OpenCV_DIR
+ NO_DEFAULT_PATH
PATH_SUFFIXES "include"
DOC "The directory where opencv/cv.h is installed")
endif()
@@ -52,7 +54,7 @@ endif()
set(opencv_core_NAMES opencv_core)
set(opencv_ml_NAMES opencv_ml)
-if ( opencv_INCLUDE_DIR )
+if (opencv_INCLUDE_DIR)
set(OPENCV_INCLUDE_DIRS "${opencv_INCLUDE_DIR}")
--
GitLab