[Jderobot-admin] jderobot-r1011 - in trunk/src/stable: components/openniServer components/rgbdManualCalibrator libs/progeo

[rocapal en jderobot.org]

Author: rocapal
Date: 2013-10-07 14:49:18 +0200 (Mon, 07 Oct 2013)
New Revision: 1011

Modified:
   trunk/src/stable/components/openniServer/CMakeLists.txt
   trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
   trunk/src/stable/libs/progeo/CMakeLists.txt
Log:
#64 added libraries to Debian env


Modified: trunk/src/stable/components/openniServer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/openniServer/CMakeLists.txt	2013-10-07 11:24:35 UTC (rev 1010)
+++ trunk/src/stable/components/openniServer/CMakeLists.txt	2013-10-07 12:49:18 UTC (rev 1011)
@@ -50,7 +50,8 @@
         JderobotInterfaces
 	${OPENNI2_LIB}/libOpenNI2.so
 	${NITE2_LIB}/libNiTE2.so
-	${Boost_LIBRARIES}	
+	${Boost_LIBRARIES}
+        ${LIBXML2_LIBRARIES}
 	)
 	else()
 	TARGET_LINK_LIBRARIES(openniServer
@@ -65,6 +66,7 @@
         JderobotInterfaces
 	${OPENNI2_LIB}/libOpenNI2.so
         ${Boost_LIBRARIES}
+        ${LIBXML2_LIBRARIES}
 	)
 	endif()
 ENDIF()

Modified: trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt	2013-10-07 11:24:35 UTC (rev 1010)
+++ trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt	2013-10-07 12:49:18 UTC (rev 1011)
@@ -13,8 +13,8 @@
 
 TARGET_LINK_LIBRARIES( rgbdManualCalibrator
  ${GLUT_LIBRARIES}
-${opencv_LIBRARIES}
-    ${OpenCVGUI_LIBRARIES}
+ ${opencv_LIBRARIES}
+ ${OpenCVGUI_LIBRARIES}
  ${gtkmm_LIBRARIES}
  ${libglademm_LIBRARIES}
  ${gthread_LIBRARIES}
@@ -24,6 +24,7 @@
  ${ZeroCIce_LIBRARIES}
  ${OpenCV_LIBRARIES}
  ${gsl_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
  jderobotutil
  colorspacesmm
  JderobotInterfaces

Modified: trunk/src/stable/libs/progeo/CMakeLists.txt
===================================================================
--- trunk/src/stable/libs/progeo/CMakeLists.txt	2013-10-07 11:24:35 UTC (rev 1010)
+++ trunk/src/stable/libs/progeo/CMakeLists.txt	2013-10-07 12:49:18 UTC (rev 1011)
@@ -5,4 +5,4 @@
 set_target_properties(progeoshare PROPERTIES OUTPUT_NAME progeo)
 
 TARGET_LINK_LIBRARIES(progeoshare ${gsl_LIBRARIES})
-TARGET_LINK_LIBRARIES(progeoshare ${xerces_LIBRARIES})
+TARGET_LINK_LIBRARIES(progeoshare ${xerces_LIBRARIES} ${LIBXML2_LIBRARIES})