[Jderobot-admin] jderobot-r1010 - in trunk/src/stable/components: basic_component cameraserver cameraview gazeboserver gazeboserver/pluginsGazebo/kinect introrob kinectViewer opencvdemo openniServer recorder remoteConfiguration replayController replayer rgbdCalibrator rgbdManualCalibrator
frivas en jderobot.org
frivas en jderobot.org
Lun Oct 7 13:25:35 CEST 2013
Author: frivas
Date: 2013-10-07 13:24:35 +0200 (Mon, 07 Oct 2013)
New Revision: 1010
Modified:
trunk/src/stable/components/basic_component/CMakeLists.txt
trunk/src/stable/components/cameraserver/CMakeLists.txt
trunk/src/stable/components/cameraview/CMakeLists.txt
trunk/src/stable/components/gazeboserver/CMakeLists.txt
trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/CMakeLists.txt
trunk/src/stable/components/introrob/CMakeLists.txt
trunk/src/stable/components/kinectViewer/CMakeLists.txt
trunk/src/stable/components/opencvdemo/CMakeLists.txt
trunk/src/stable/components/openniServer/CMakeLists.txt
trunk/src/stable/components/recorder/CMakeLists.txt
trunk/src/stable/components/remoteConfiguration/CMakeLists.txt
trunk/src/stable/components/replayController/CMakeLists.txt
trunk/src/stable/components/replayer/CMakeLists.txt
trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt
trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
Log:
#64 Checked jderobot libs interdependencies to support multicore compilation
Modified: trunk/src/stable/components/basic_component/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/basic_component/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/basic_component/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -12,9 +12,9 @@
TARGET_LINK_LIBRARIES(basic_component
${CMAKE_THREAD_LIBS_INIT}
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
+ JderobotInterfaces
+ jderobotutil
+ colorspacesmm
${libglademm_LIBRARIES}
${OpenCV_LIBRARIES}
${OpenCVGUI_LIBRARIES}
Modified: trunk/src/stable/components/cameraserver/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/cameraserver/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/cameraserver/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -14,8 +14,8 @@
TARGET_LINK_LIBRARIES(cameraserver
${OpenCV_LIBRARIES}
${OpenCVGUI_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
+ colorspacesmm
+ JderobotInterfaces
${ZeroCIce_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
)
Modified: trunk/src/stable/components/cameraview/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/cameraview/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/cameraview/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -16,7 +16,7 @@
${OpenCVGUI_LIBRARIES}
${gtkmm_LIBRARIES}
${libglademm_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
+ colorspacesmm
+ JderobotInterfaces
${ZeroCIce_LIBRARIES}
)
Modified: trunk/src/stable/components/gazeboserver/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/gazeboserver/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/gazeboserver/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -14,42 +14,40 @@
${GAZEBO_libraries}
${ZeroCIce_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)
+ colorspacesmm
+ JderobotInterfaces)
add_library(encoders SHARED encoders.cc)
target_link_libraries(encoders
${GAZEBO_libraries}
${ZeroCIce_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)
+ colorspacesmm
+ JderobotInterfaces)
add_library(laser SHARED laser.cc)
target_link_libraries(laser
RayPlugin
${GAZEBO_libraries}
-
${ZeroCIce_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)
+ colorspacesmm
+ JderobotInterfaces)
add_library(camera_dump SHARED camera_dump.cc)
target_link_libraries(camera_dump ${GAZEBO_libraries}
CameraPlugin
${GAZEBO_libraries}
-
${ZeroCIce_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)
+ colorspacesmm
+ JderobotInterfaces)
add_library(pose3dencoders SHARED pose3dencoders.cc)
target_link_libraries(pose3dencoders ${GAZEBO_libraries}
${GAZEBO_libraries}
${ZeroCIce_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)
+ colorspacesmm
+ JderobotInterfaces)
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/pluginsGazebo ${CMAKE_CURRENT_SOURCE_DIR}/pluginsGazebo)
Modified: trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -16,8 +16,8 @@
add_library(kinectPlugin SHARED kinectPlugin.cc)
target_link_libraries(kinectPlugin
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
+ JderobotInterfaces
+ jderobotutil
${GAZEBO_libraries}
${PCL_LIBRARIES}
${OpenCV_LIBRARIES}
Modified: trunk/src/stable/components/introrob/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/introrob/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/introrob/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -24,11 +24,11 @@
${libgnomecanvasmm_LIBRARIES}
${gtkglextmm_LIBRARIES}
${OpenCV_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
- ${LIBS_DIR}/progeo/libprogeo.so
- ${LIBS_DIR}/pioneer/libpioneer.so
+ colorspacesmm
+ JderobotInterfaces
+ jderobotutil
+ progeo
+ pioneer
"glut"
"gsl"
"gslcblas"
Modified: trunk/src/stable/components/kinectViewer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/kinectViewer/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/kinectViewer/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -22,12 +22,12 @@
${OpenCVGUI_LIBRARIES}
${libglademm_LIBRARIES}
${gtkglextmm_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
- ${LIBS_DIR}/progeo/libprogeo.so
- ${LIBS_DIR}/pioneer/libpioneer.so
- ${LIBS_DIR}/parallelIce/libparallelIce.so
+ colorspacesmm
+ JderobotInterfaces
+ jderobotutil
+ progeo
+ pioneer
+ parallelIce
${gsl_LIBRARIES}
${ZeroCIce_LIBRARIES}
)
Modified: trunk/src/stable/components/opencvdemo/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/opencvdemo/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/opencvdemo/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -22,9 +22,9 @@
# ${libgnomecanvasmm_LIBRARIES}
# ${gtkglextmm_LIBRARIES}
${OpenCV_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
+ colorspacesmm
+ JderobotInterfaces
+ jderobotutil
${Gearbox_LIBRARIES}
${ZeroCIce_LIBRARIES}
Modified: trunk/src/stable/components/openniServer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/openniServer/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/openniServer/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -44,10 +44,10 @@
${OpenCV_LIBRARIES}
${OpenCVGUI_LIBRARIES}
${gsl_LIBRARIES}
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
- ${LIBS_DIR}/progeo/libprogeo.so
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
+ jderobotutil
+ progeo
+ colorspacesmm
+ JderobotInterfaces
${OPENNI2_LIB}/libOpenNI2.so
${NITE2_LIB}/libNiTE2.so
${Boost_LIBRARIES}
@@ -59,10 +59,10 @@
${OpenCV_LIBRARIES}
${OpenCVGUI_LIBRARIES}
${gsl_LIBRARIES}
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
- ${LIBS_DIR}/progeo/libprogeo.so
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
+ jderobotutil
+ libprogeo
+ colorspacesmm
+ JderobotInterfaces
${OPENNI2_LIB}/libOpenNI2.so
${Boost_LIBRARIES}
)
Modified: trunk/src/stable/components/recorder/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/recorder/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/recorder/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -22,9 +22,9 @@
${gtkmm_LIBRARIES}
${libglademm_LIBRARIES}
${gtkglextmm_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
+ colorspacesmm
+ JderobotInterfaces
+ jderobotutil
${gsl_LIBRARIES}
${ZeroCIce_LIBRARIES}
${Boost_LIBRARIES}
Modified: trunk/src/stable/components/remoteConfiguration/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/remoteConfiguration/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/remoteConfiguration/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -25,8 +25,8 @@
${gtkglextmm_LIBRARIES}
${libglademm_LIBRARIES}
${gtkmm_LIBRARIES}
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
+ JderobotInterfaces
+ jderobotutil
${CMAKE_THREAD_LIBS_INIT}
${ZeroCIce_LIBRARIES}
)
Modified: trunk/src/stable/components/replayController/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/replayController/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/replayController/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -25,10 +25,10 @@
${gtkmm_LIBRARIES}
${libglademm_LIBRARIES}
${gtkglextmm_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
- ${LIBS_DIR}/progeo/libprogeo.so
- ${LIBS_DIR}/pioneer/libpioneer.so
+ colorspacesmm
+ JderobotInterfaces
+ jderobotutil
+ progeo
+ pioneer
${ZeroCIce_LIBRARIES}
)
Modified: trunk/src/stable/components/replayer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/replayer/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/replayer/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -22,9 +22,9 @@
${gtkmm_LIBRARIES}
${libglademm_LIBRARIES}
${gtkglextmm_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
+ colorspacesmm
+ JderobotInterfaces
+ jderobotutil
${gsl_LIBRARIES}
${ZeroCIce_LIBRARIES}
)
Modified: trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -18,13 +18,13 @@
${OpenCVGUI_LIBRARIES}
${gtkmm_LIBRARIES}
${libglademm_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
+ colorspacesmm
+ JderobotInterfaces
${ZeroCIce_LIBRARIES}
${Boost_LIBRARIES}
- ${LIBS_DIR}/progeo/libprogeo.so
- ${LIBS_DIR}/geometry/libgeometry.so
- ${LIBS_DIR}/colorspaces/libcolorspaces.so
- ${LIBS_DIR}/cvBlob/libcvblob.so
+ progeo
+ geometry
+ colorspaces
+ cvblob
)
Modified: trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt 2013-10-07 11:05:33 UTC (rev 1009)
+++ trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt 2013-10-07 11:24:35 UTC (rev 1010)
@@ -24,10 +24,10 @@
${ZeroCIce_LIBRARIES}
${OpenCV_LIBRARIES}
${gsl_LIBRARIES}
- ${LIBS_DIR}/jderobotutil/libjderobotutil.so
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/progeo/libprogeo.so
- ${LIBS_DIR}/parallelIce/libparallelIce.so
+ jderobotutil
+ colorspacesmm
+ JderobotInterfaces
+ progeo
+ parallelIce
#-lxerces-c
)
More information about the Jderobot-admin
mailing list