[Jderobot-admin] jderobot-r1004 - in trunk: Deps/opencv src/stable/libs/colorspaces

[rocapal en jderobot.org]

Author: rocapal
Date: 2013-10-07 11:30:34 +0200 (Mon, 07 Oct 2013)
New Revision: 1004

Modified:
   trunk/Deps/opencv/CMakeLists.txt
   trunk/src/stable/libs/colorspaces/CMakeLists.txt
Log:
#62 split gui ad no-gui dependences of opencv



Modified: trunk/Deps/opencv/CMakeLists.txt
===================================================================
--- trunk/Deps/opencv/CMakeLists.txt	2013-10-07 08:17:36 UTC (rev 1003)
+++ trunk/Deps/opencv/CMakeLists.txt	2013-10-07 09:30:34 UTC (rev 1004)
@@ -1,7 +1,7 @@
 FIND_PATH( OpenCV_INCLUDE_DIR NAMES cv.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES include/opencv/)
 IF( OpenCV_INCLUDE_DIR )
-	#MESSAGE("OpenCV was found in: ${OpenCV_INCLUDE_DIR}")
-	MESSAGE("*** OpenCV ok")
+	MESSAGE("OpenCV was found in: ${OpenCV_INCLUDE_DIR}")
+	
     FIND_LIBRARY( OpenCV_LIBRARY1 NAMES opencv_core PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
     FIND_LIBRARY( OpenCV_LIBRARY2 NAMES opencv_highgui PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
     FIND_LIBRARY( OpenCV_LIBRARY3 NAMES opencv_contrib PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
@@ -13,7 +13,8 @@
     FIND_LIBRARY( OpenCV_LIBRARY9 NAMES opencv_ml PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
     FIND_LIBRARY( OpenCV_LIBRARY11 NAMES opencv_objdetect PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
     FIND_LIBRARY( OpenCV_LIBRARY14 NAMES opencv_video PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
-    SET (OpenCV_LIBRARIES ${OpenCV_LIBRARY1} ${OpenCV_LIBRARY2} ${OpenCV_LIBRARY3} ${OpenCV_LIBRARY4} ${OpenCV_LIBRARY5} ${OpenCV_LIBRARY6} ${OpenCV_LIBRARY7} ${OpenCV_LIBRARY8} ${OpenCV_LIBRARY9} ${OpenCV_LIBRARY11} ${OpenCV_LIBRARY14} )
+    SET (OpenCV_LIBRARIES ${OpenCV_LIBRARY1} ${OpenCV_LIBRARY5}  ${OpenCV_LIBRARY7}  ${OpenCV_LIBRARY9}  ${OpenCV_LIBRARY14} )
+    SET (OpenCVGUI_LIBRARIES ${OpenCV_LIBRARY2} ${OpenCV_LIBRARY3} ${OpenCV_LIBRARY4} ${OpenCV_LIBRARY6} ${OpenCV_LIBRARY8} ${OpenCV_LIBRARY11})
     IF( OpenCV_LIBRARIES )
 		#MESSAGE("OPENCV LIBRARY FOUND IN ${OpenCV_LIBRARIES}")
     ENDIF( OpenCV_LIBRARIES )

Modified: trunk/src/stable/libs/colorspaces/CMakeLists.txt
===================================================================
--- trunk/src/stable/libs/colorspaces/CMakeLists.txt	2013-10-07 08:17:36 UTC (rev 1003)
+++ trunk/src/stable/libs/colorspaces/CMakeLists.txt	2013-10-07 09:30:34 UTC (rev 1004)
@@ -1,4 +1,6 @@
 
+
+
 add_library (colorspacesmm STATIC imagecv.cpp imagecv.h uncopyable.h)
 
 TARGET_LINK_LIBRARIES(colorspacesmm ${OpenCV_LIBRARIES})
@@ -9,7 +11,7 @@
 
 add_library (colorspacesshare SHARED rgb2hsv.c rgb2yuv.c colorspaces.h colorspacesmm.h)
 
-TARGET_LINK_LIBRARIES(colorspacesshare ${OpenCV_LIBRARIES})
+TARGET_LINK_LIBRARIES(colorspacesshare  ${OpenCV_LIBRARIES})
 
 add_library (colorspacesmmshare SHARED imagecv.cpp imagecv.h uncopyable.h)