From a8d86fc813b2b21da9b536dd65112c2d5fea0850 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Tue, 6 Sep 2016 16:07:00 +0200
Subject: [PATCH] mantis-1236. use correct variable for include dirs

---
 CMake/FindOpenCV.cmake                   | 37 ++++++++++++------------
 Modules/ThirdParty/OpenCV/CMakeLists.txt |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/CMake/FindOpenCV.cmake b/CMake/FindOpenCV.cmake
index 0933afc346..4f665c7290 100755
--- a/CMake/FindOpenCV.cmake
+++ b/CMake/FindOpenCV.cmake
@@ -1,11 +1,11 @@
-find_path( 
-cv_INCLUDE_DIR 
-opencv/cv.h 
+find_path(
+cv_INCLUDE_DIR
+opencv/cv.h
 DOC "The directory where opencv/cv.h is installed")
 
-find_path( 
-opencv2_INCLUDE_DIR 
-opencv2/opencv.hpp 
+find_path(
+opencv2_INCLUDE_DIR
+opencv2/opencv.hpp
 DOC "The directory where opencv2/opencv.hpp is installed")
 
 set(opencv_core_NAMES opencv_core)
@@ -14,31 +14,31 @@ set(opencv_ml_NAMES opencv_ml)
 if ( cv_INCLUDE_DIR AND opencv2_INCLUDE_DIR )
 	set(OPENCV_INCLUDE_DIRS "${cv_INCLUDE_DIR};${opencv2_INCLUDE_DIR}")
 	list(REMOVE_DUPLICATES OPENCV_INCLUDE_DIRS)
-	
+
 	if(NOT OpenCV_VERSION)
 		file(READ "${opencv2_INCLUDE_DIR}/opencv2/core/version.hpp" _header_content)
-		string(REGEX REPLACE ".*# *define +CV_VERSION_EPOCH +([0-9]+).*" "\\1" 
+		string(REGEX REPLACE ".*# *define +CV_VERSION_EPOCH +([0-9]+).*" "\\1"
 		OpenCV_VERSION_MAJOR ${_header_content})
-		string(REGEX REPLACE ".*# *define +CV_VERSION_MAJOR +([0-9]+).*" "\\1" 
+		string(REGEX REPLACE ".*# *define +CV_VERSION_MAJOR +([0-9]+).*" "\\1"
 		OpenCV_VERSION_MINOR ${_header_content})
-		string(REGEX REPLACE ".*# *define +CV_VERSION_MINOR +([0-9]+).*" "\\1" 
+		string(REGEX REPLACE ".*# *define +CV_VERSION_MINOR +([0-9]+).*" "\\1"
 		OpenCV_VERSION_PATCH ${_header_content})
-		string(REGEX REPLACE ".*# *define +CV_VERSION_REVISION +([0-9]+).*" "\\1" 
+		string(REGEX REPLACE ".*# *define +CV_VERSION_REVISION +([0-9]+).*" "\\1"
 		OpenCV_VERSION_TWEAK ${_header_content})
-		set(OpenCV_VERSION 
+		set(OpenCV_VERSION
 		"${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}")
 	endif()
-	
+
 	if(WIN32)
-	list(APPEND opencv_core_NAMES 
+	list(APPEND opencv_core_NAMES
 	"opencv_core${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
-	list(APPEND opencv_ml_NAMES 
+	list(APPEND opencv_ml_NAMES
 	"opencv_ml${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
 	endif()
 endif()
 
 # Prefer the static library.
-find_library( 
+find_library(
 OPENCV_core_LIBRARY
 NAMES ${opencv_core_NAMES}
 DOC "Path to opencv_core library")
@@ -54,10 +54,11 @@ if ( OPENCV_core_LIBRARY AND OPENCV_ml_LIBRARY )
 endif ()
 
 if( OPENCV_INCLUDE_DIRS AND OPENCV_LIBRARIES )
-	set(OpenCV_FOUND TRUE)
+  set(OpenCV_FOUND TRUE)
+  set(OPENCV_VERSION ${OpenCV_VERSION}) #for compatility
 endif()
 
 include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENCV 
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENCV
   REQUIRED_VARS OPENCV_core_LIBRARY OPENCV_INCLUDE_DIRS
   VERSION_VAR OpenCV_VERSION)
diff --git a/Modules/ThirdParty/OpenCV/CMakeLists.txt b/Modules/ThirdParty/OpenCV/CMakeLists.txt
index e170802fed..b9efdd150d 100644
--- a/Modules/ThirdParty/OpenCV/CMakeLists.txt
+++ b/Modules/ThirdParty/OpenCV/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(OTBOpenCV)
 
-set(OTBOpenCV_SYSTEM_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS})
+set(OTBOpenCV_SYSTEM_INCLUDE_DIRS ${OPENCV_INCLUDE_DIRS})
 set(OTBOpenCV_LIBRARIES "${OPENCV_LIBRARIES}")
 set(OTBOpenCV_EXPORT_CODE_BUILD "find_package(OpenCV REQUIRED)")
 set(OTBOpenCV_EXPORT_CODE_INSTALL ${OTBOpenCV_EXPORT_CODE_BUILD})
-- 
GitLab