[Jderobot-admin] jderobot-r986 - in trunk: . src/stable/components/introrob src/stable/components/openniServer src/stable/components/playerserver src/stable/components/playerserver2.0 src/stable/components/rgbdCalibrator src/stable/libs/parallelIce src/stable/libs/visionlib
frivas en jderobot.org
frivas en jderobot.org
Sab Sep 21 13:14:23 CEST 2013
Author: frivas
Date: 2013-09-21 13:13:23 +0200 (Sat, 21 Sep 2013)
New Revision: 986
Modified:
trunk/CMakeLists.txt
trunk/src/stable/components/introrob/API.h
trunk/src/stable/components/introrob/gui.h
trunk/src/stable/components/openniServer/CMakeLists.txt
trunk/src/stable/components/playerserver/CMakeLists.txt
trunk/src/stable/components/playerserver2.0/CMakeLists.txt
trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt
trunk/src/stable/libs/parallelIce/CMakeLists.txt
trunk/src/stable/libs/visionlib/CMakeLists.txt
Log:
1 Revisadas interdependencias de liber?\195?\173as de progeo
2 Reordenadas las dependencias de rgdbcalibrator para compilar con 4.6
3 Eliminada la dependenciad de opencv del cmake raiz
4 Desactivados los playerserver
5 Modificadas los includes a progeo de introrob
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/CMakeLists.txt 2013-09-21 11:13:23 UTC (rev 986)
@@ -57,11 +57,7 @@
# FIND & CHECK PRINCIPAL LIBRARIES
include(FindPkgConfig)
-PKG_CHECK_MODULES(opencv opencv)
-include_directories(${opencv_INCLUDE_DIRS})
-link_directories(${opencv_LIBRARY_DIRS})
-MESSAGE("${opencv_LIBRARY_DIRS}")
-MESSAGE("${opencv_INCLUDE_DIRS}")
+
PKG_CHECK_MODULES(gtk20 REQUIRED gtk+-2.0)
include_directories(${gtk20_INCLUDE_DIRS})
link_directories(${gtk20_LIBRARY_DIRS})
@@ -106,7 +102,6 @@
link_directories(${gstreamerapp_LIBRARY_DIRS})
-include_directories(${LIBS_DIR}/progeo)
FOREACH(LibFile ${LIBS_NEEDED})
link_directories(${LIBS_DIR}/${LibFile})
MESSAGE("${LIBS_DIR}/${LibFile}")
Modified: trunk/src/stable/components/introrob/API.h
===================================================================
--- trunk/src/stable/components/introrob/API.h 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/components/introrob/API.h 2013-09-21 11:13:23 UTC (rev 986)
@@ -26,7 +26,7 @@
//#include "camera.h"
-#include <progeo.h>
+#include <progeo/progeo.h>
#include <cv.h>
#include <highgui.h>
#include <iostream>
Modified: trunk/src/stable/components/introrob/gui.h
===================================================================
--- trunk/src/stable/components/introrob/gui.h 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/components/introrob/gui.h 2013-09-21 11:13:23 UTC (rev 986)
@@ -42,7 +42,7 @@
#include <gdkmm/pixbuf.h>
#include "API.h"
//#include "camera.h"
-#include <progeo.h>
+#include <progeo/progeo.h>
#include <libgnomecanvasmm.h>
#include "drawarea.h"
Modified: trunk/src/stable/components/openniServer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/openniServer/CMakeLists.txt 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/components/openniServer/CMakeLists.txt 2013-09-21 11:13:23 UTC (rev 986)
@@ -41,7 +41,7 @@
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_THREAD_LIBS_INIT}
${ZeroCIce_LIBRARIES}
- ${opencv_LIBRARIES}
+ ${OpenCV_LIBRARIES}
${gsl_LIBRARIES}
${LIBS_DIR}/jderobotutil/libjderobotutil.so
${LIBS_DIR}/progeo/libprogeo.so
@@ -55,7 +55,7 @@
TARGET_LINK_LIBRARIES(openniServer
${CMAKE_THREAD_LIBS_INIT}
${ZeroCIce_LIBRARIES}
- ${opencv_LIBRARIES}
+ ${OpenCV_LIBRARIES}
${gsl_LIBRARIES}
${LIBS_DIR}/jderobotutil/libjderobotutil.so
${LIBS_DIR}/progeo/libprogeo.so
Modified: trunk/src/stable/components/playerserver/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/playerserver/CMakeLists.txt 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/components/playerserver/CMakeLists.txt 2013-09-21 11:13:23 UTC (rev 986)
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8)
-IF( Gearbox_INCLUDE_DIR )
+IF( false )
SET( SOURCE_FILES playerserver4.cpp)
#SET( LIBS_DIR /usr/local/lib/jderobot/)
Modified: trunk/src/stable/components/playerserver2.0/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/playerserver2.0/CMakeLists.txt 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/components/playerserver2.0/CMakeLists.txt 2013-09-21 11:13:23 UTC (rev 986)
@@ -1,4 +1,4 @@
-IF( with_player)
+IF( false)
SET( SOURCE_FILES playerserver.cpp)
Modified: trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/components/rgbdCalibrator/CMakeLists.txt 2013-09-21 11:13:23 UTC (rev 986)
@@ -12,6 +12,7 @@
TARGET_LINK_LIBRARIES(rgbdCalibrator
${CMAKE_THREAD_LIBS_INIT}
+ ${gsl_LIBRARIES}
${alut_LIBRARIES}
${OpenCV_LIBRARIES}
${gtkmm_LIBRARIES}
@@ -24,5 +25,5 @@
${LIBS_DIR}/geometry/libgeometry.so
${LIBS_DIR}/colorspaces/libcolorspaces.so
${LIBS_DIR}/cvBlob/libcvblob.so
- ${gsl_LIBRARIES}
+
)
Modified: trunk/src/stable/libs/parallelIce/CMakeLists.txt
===================================================================
--- trunk/src/stable/libs/parallelIce/CMakeLists.txt 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/libs/parallelIce/CMakeLists.txt 2013-09-21 11:13:23 UTC (rev 986)
@@ -3,26 +3,13 @@
include_directories(${LIBS_DIR}) # Aquí se alojan las cabeceras de las interfaces ICE en C++
-include_directories(
- ${INTERFACES_CPP_DIR}
- ${LIBS_DIR}/
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/cameras
-)
+include_directories( ${LIBS_DIR}/)
add_library (parallelIce STATIC cameraClient.cpp cameraClient.h pointcloudClient.cpp pointcloudClient.h)
-TARGET_LINK_LIBRARIES(parallelIce
- ${OpenCV_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${ZeroCIce_LIBRARIES}
-)
+TARGET_LINK_LIBRARIES(parallelIce colorspacesmm)
add_library (parallelIceshare SHARED cameraClient.cpp cameraClient.h pointcloudClient.cpp pointcloudClient.h)
-TARGET_LINK_LIBRARIES(parallelIceshare
- ${OpenCV_LIBRARIES}
- ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
- ${ZeroCIce_LIBRARIES}
-)
+TARGET_LINK_LIBRARIES(parallelIceshare colorspacesmm)
set_target_properties(parallelIceshare PROPERTIES OUTPUT_NAME parallelIce)
Modified: trunk/src/stable/libs/visionlib/CMakeLists.txt
===================================================================
--- trunk/src/stable/libs/visionlib/CMakeLists.txt 2013-09-19 15:15:55 UTC (rev 985)
+++ trunk/src/stable/libs/visionlib/CMakeLists.txt 2013-09-21 11:13:23 UTC (rev 986)
@@ -1,25 +1,7 @@
SET( SOURCE_FILES cvfast.cpp geometry.cpp image.cpp linesDetection.cpp)
-
-set( CMAKE_CXX_FLAGS "-lgsl -lgslcblas" ) # Opciones para el compilador-lgsl -lgslcblas -lGL -lGLU -lglut -lgazebo
-
-include_directories(
- ${SLICE_DIR}
- ${INTERFACES_CPP_DIR}
- ${LIBS_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
+include_directories( ${LIBS_DIR}/)
add_library (visionlib SHARED ${SOURCE_FILES})
+TARGET_LINK_LIBRARIES(visionlib progeo)
-TARGET_LINK_LIBRARIES(visionlib
- ${opencv_LIBRARIES}
- ${gtkmm_LIBRARIES}
- ${libglademm_LIBRARIES}
- ${gthread_LIBRARIES}
- ${libgnomecanvas_LIBRARIES}
- ${libgnomecanvasmm_LIBRARIES}
- ${gtkglextmm_LIBRARIES}
- ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
- ${LIBS_DIR}/progeo/libprogeo.so
-)
+
More information about the Jderobot-admin
mailing list