[Digikam-devel] kdereview/libkface

[Michael Georg Hansen]

SVN commit 1201006 by mghansen:

Fix build with local version of FindOpenCV. Apparently, the FindOpenCV shipped with OpenCV on some systems uses OpenCV_LIBS, while the local version uses OpenCV_LIBRARIES.

Do we have to be capable of using both FindOpenCV versions? If so, we will have to detect which variable is set.

CCMAIL: digikam-devel at kde.org



 M  +0 -2      CMakeLists.txt  
 M  +1 -1      libkface/CMakeLists.txt  


--- trunk/kdereview/libkface/CMakeLists.txt #1201005:1201006
@@ -46,8 +46,6 @@
 
 if (OpenCV_FOUND)
 
-#SET(OpenCV_LIBS ${OpenCV_LIBRARIES})
-
 INCLUDE_DIRECTORIES( ${LIBFACE_INCLUDE_DIR}
                      ${OpenCV_INCLUDE_DIRS}
                    )
--- trunk/kdereview/libkface/libkface/CMakeLists.txt #1201005:1201006
@@ -49,7 +49,7 @@
                             ${KDE4_KDEUI_LIBS}
                             ${QT_QTGUI_LIBRARY}
                             ${LIBFACE_LIBRARIES}
-                            ${OpenCV_LIBS}
+                            ${OpenCV_LIBRARIES}
                             )
 
 SET_TARGET_PROPERTIES(kface PROPERTIES VERSION ${KFACE_LIB_SO_VERSION_STRING}