Destinquish old and new OpenCV

src/Mod/Image/App/CMakeLists.txt

@@ -2,12 +2,12 @@ if(WIN32)
     add_definitions(-DFCAppImage)
 endif(WIN32)
 
-if(OPENCV_FOUND)
-    add_definitions(-DHAVE_OPENCV)
-endif(OPENCV_FOUND)
+if(OPENCV2_FOUND)
+    add_definitions(-DHAVE_OPENCV2)
+endif(OPENCV2_FOUND)
 
 include_directories(
-    ${OPENCV_INCLUDE_DIR}
+    ${OPENCV_INCLUDE2_DIR}
     ${PYTHON_INCLUDE_PATH}
     ${Boost_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
@@ -16,7 +16,7 @@ include_directories(
 )
 
 set(Image_LIBS
-    ${OPENCV_LIBRARIES}
+    ${OPENCV2_LIBRARIES}
     FreeCADApp
 )
 

src/Mod/Image/Gui/CMakeLists.txt

@@ -1,14 +1,14 @@
 
-if(OPENCV_FOUND)
-    add_definitions(-DHAVE_OPENCV)
-endif(OPENCV_FOUND)
+if(OPENCV2_FOUND)
+    add_definitions(-DHAVE_OPENCV2)
+endif(OPENCV2_FOUND)
 
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Boost_INCLUDE_DIRS}
     ${COIN3D_INCLUDE_DIR}
-    ${OPENCV_INCLUDE_DIR}
+    ${OPENCV2_INCLUDE_DIR}
     ${QT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${SOQT_INCLUDE_DIR}
@@ -19,7 +19,7 @@ include_directories(
 set(ImageGui_LIBS
     Image
     FreeCADGui
-    ${OpenCV_LIBRARIES}
+    ${OpenCV2_LIBRARIES}
     ${OPENGL_glu_LIBRARY}
 )
 

src/Mod/Image/Gui/Command.cpp

@@ -31,7 +31,7 @@
 #include <Gui/BitmapFactory.h>
 #include "ImageOrientationDialog.h"
 
-#if HAVE_OPENCV
+#if HAVE_OPENCV2
 #  include "opencv2/opencv.hpp"
 #endif
 
@@ -147,7 +147,7 @@ bool CmdCreateImagePlane::isActive()
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#if HAVE_OPENCV
+#if HAVE_OPENCV2
 DEF_STD_CMD(CmdImageCapturerTest);
 
 CmdImageCapturerTest::CmdImageCapturerTest()
@@ -193,7 +193,7 @@ void CreateImageCommands(void)
 
     rcCmdMgr.addCommand(new CmdImageOpen());
     rcCmdMgr.addCommand(new CmdCreateImagePlane());
-#if HAVE_OPENCV
+#if HAVE_OPENCV2
 	rcCmdMgr.addCommand(new CmdImageCapturerTest());
 #endif
 }