suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Destinquish old and new OpenCV

Browse Source
This commit is contained in:
jriegel 2014-08-27 16:42:50 +02:00
parent 58a7be992b
commit 5bdfe81488
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cMake/UseLibPack10x.cmake
View File

@ -294,8 +294,8 @@ set(SOQT_LIBRARY_DEBUG soqt1d.lib)
set(SOQT_FOUND TRUE)
# OpenCV
set(OPENCV_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/opencv)
set(OPENCV_LIBRARIES
set(OPENCV2_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/opencv)
set(OPENCV2_LIBRARIES
optimized opencv_calib3d249.lib
debug opencv_calib3d249d.lib
optimized opencv_contrib249.lib
@ -335,7 +335,7 @@ set(OPENCV_LIBRARIES
optimized opencv_videostab249.lib
debug opencv_videostab249d.lib
)
set(OPENCV_FOUND TRUE)
set(OPENCV2_FOUND TRUE)
# NGLIB (NetGen)

10
src/Mod/Image/App/CMakeLists.txt
View File

@ -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
)

10
src/Mod/Image/Gui/CMakeLists.txt
View File

@ -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}
)

6
src/Mod/Image/Gui/Command.cpp
View File

@ -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
}