kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 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
Download Patch File Download Diff File Expand all files Collapse all files

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