[Jderobot-admin] jderobot-r949 - in trunk/src/components: basic_component/build cameraserver cameraserver/build cameraview_icestorm cameraview_icestorm/build colortuner/build introrob introrob/build kinectViewer kinectViewer/build
lr.morales en jderobot.org
lr.morales en jderobot.org
Lun Jul 22 11:02:33 CEST 2013
Author: lr.morales
Date: 2013-07-22 11:01:33 +0200 (Mon, 22 Jul 2013)
New Revision: 949
Modified:
trunk/src/components/basic_component/build/CMakeLists.txt
trunk/src/components/cameraserver/CMakeLists.txt
trunk/src/components/cameraserver/build/CMakeLists.txt
trunk/src/components/cameraview_icestorm/CMakeLists.txt
trunk/src/components/cameraview_icestorm/build/CMakeLists.txt
trunk/src/components/colortuner/build/CMakeLists.txt
trunk/src/components/introrob/CMakeLists.txt
trunk/src/components/introrob/build/CMakeLists.txt
trunk/src/components/kinectViewer/CMakeLists.txt
trunk/src/components/kinectViewer/build/CMakeLists.txt
Log:
[lr.morales] Fixed CMake calls for some components
(no pthread search before including / library order for gcc 4.6 linkers)
Modified: trunk/src/components/basic_component/build/CMakeLists.txt
===================================================================
--- trunk/src/components/basic_component/build/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/basic_component/build/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -38,6 +38,7 @@
include(${DEPS_DIR}/gearbox/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
include(${DEPS_DIR}/opencv/CMakeLists.txt)
+include(${DEPS_DIR}/pthread/CMakeLists.txt)
include_directories(${LIBS_DIR}/progeo)
Modified: trunk/src/components/cameraserver/CMakeLists.txt
===================================================================
--- trunk/src/components/cameraserver/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/cameraserver/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -12,9 +12,9 @@
add_executable (cameraserver ${SOURCE_FILES})
TARGET_LINK_LIBRARIES(cameraserver
- ${CMAKE_THREAD_LIBS_INIT}
${OpenCV_LIBRARIES}
${LIBS_DIR}/colorspaces/libcolorspacesmm.so
${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
${ZeroCIce_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
)
Modified: trunk/src/components/cameraserver/build/CMakeLists.txt
===================================================================
--- trunk/src/components/cameraserver/build/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/cameraserver/build/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -24,6 +24,7 @@
include(${DEPS_DIR}/gearbox/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
include(${DEPS_DIR}/opencv/CMakeLists.txt)
+include(${DEPS_DIR}/pthread/CMakeLists.txt)
Modified: trunk/src/components/cameraview_icestorm/CMakeLists.txt
===================================================================
--- trunk/src/components/cameraview_icestorm/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/cameraview_icestorm/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -12,7 +12,7 @@
TARGET_LINK_LIBRARIES(cameraview_icestorm
${CMAKE_THREAD_LIBS_INIT}
- ${opencv_LIBRARIES}
+ ${OpenCV_LIBRARIES}
${gtkmm_LIBRARIES}
${libglademm_LIBRARIES}
# ${gthread_LIBRARIES}
Modified: trunk/src/components/cameraview_icestorm/build/CMakeLists.txt
===================================================================
--- trunk/src/components/cameraview_icestorm/build/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/cameraview_icestorm/build/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -22,9 +22,9 @@
# FIND & CHECK PRINCIPAL LIBRARIES
include(FindPkgConfig)
-PKG_CHECK_MODULES(opencv REQUIRED opencv)
-include_directories(${opencv_INCLUDE_DIRS})
-link_directories(${opencv_LIBRARY_DIRS})
+#PKG_CHECK_MODULES(opencv REQUIRED opencv)
+#include_directories(${opencv_INCLUDE_DIRS})
+#link_directories(${opencv_LIBRARY_DIRS})
#PKG_CHECK_MODULES(gtk20 REQUIRED gtk+-2.0)
#include_directories(${gtk20_INCLUDE_DIRS})
@@ -67,6 +67,8 @@
# FIND AND CHECK OTHER DEPENDENCES
include(${DEPS_DIR}/gearbox/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
+include(${DEPS_DIR}/pthread/CMakeLists.txt)
+include(${DEPS_DIR}/opencv/CMakeLists.txt)
Modified: trunk/src/components/colortuner/build/CMakeLists.txt
===================================================================
--- trunk/src/components/colortuner/build/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/colortuner/build/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -22,9 +22,9 @@
# FIND & CHECK PRINCIPAL LIBRARIES
include(FindPkgConfig)
-PKG_CHECK_MODULES(opencv REQUIRED opencv)
-include_directories(${opencv_INCLUDE_DIRS})
-link_directories(${opencv_LIBRARY_DIRS})
+#PKG_CHECK_MODULES(opencv REQUIRED opencv)
+#include_directories(${opencv_INCLUDE_DIRS})
+#link_directories(${opencv_LIBRARY_DIRS})
#PKG_CHECK_MODULES(gtk20 REQUIRED gtk+-2.0)
#include_directories(${gtk20_INCLUDE_DIRS})
@@ -68,6 +68,7 @@
include(${DEPS_DIR}/gearbox/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
include(${DEPS_DIR}/opencv/CMakeLists.txt)
+include(${DEPS_DIR}/pthread/CMakeLists.txt)
# START RECURSIVE
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
Modified: trunk/src/components/introrob/CMakeLists.txt
===================================================================
--- trunk/src/components/introrob/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/introrob/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -10,10 +10,9 @@
${CMAKE_CURRENT_SOURCE_DIR}/../calibrator
)
-set( CMAKE_CXX_FLAGS "-lglut -lgsl -lgslcblas" ) # Opciones para el compilador
+set( CMAKE_CXX_FLAGS "") #"-lgsl -lgslcblas" ) # Opciones para el compilador
add_executable (introrob ${SOURCE_FILES})
-
TARGET_LINK_LIBRARIES(introrob
${CMAKE_THREAD_LIBS_INIT}
${opencv_LIBRARIES}
@@ -29,7 +28,10 @@
${LIBS_DIR}/jderobotutil/libjderobotutil.so
${LIBS_DIR}/progeo/libprogeo.so
${LIBS_DIR}/pioneer/libpioneer.so
- ${gsl_LIBRARIES}
+ "glut"
+ "gsl"
+ "gslcblas"
+# ${gsl_LIBRARIES}
${ZeroCIce_LIBRARIES}
${Gearbox_LIBRARIES}
)
Modified: trunk/src/components/introrob/build/CMakeLists.txt
===================================================================
--- trunk/src/components/introrob/build/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/introrob/build/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -63,6 +63,7 @@
include(${DEPS_DIR}/gearbox/CMakeLists.txt)
include(${DEPS_DIR}/ice/CMakeLists.txt)
include(${DEPS_DIR}/opencv/CMakeLists.txt)
+include(${DEPS_DIR}/pthread/CMakeLists.txt)
include_directories(${LIBS_DIR}/progeo)
Modified: trunk/src/components/kinectViewer/CMakeLists.txt
===================================================================
--- trunk/src/components/kinectViewer/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/kinectViewer/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -27,5 +27,6 @@
${LIBS_DIR}/progeo/libprogeo.so
${LIBS_DIR}/pioneer/libpioneer.so
${LIBS_DIR}/parallelIce/libparallelIce.so
+ ${gsl_LIBRARIES}
${ZeroCIce_LIBRARIES}
)
Modified: trunk/src/components/kinectViewer/build/CMakeLists.txt
===================================================================
--- trunk/src/components/kinectViewer/build/CMakeLists.txt 2013-07-19 09:49:30 UTC (rev 948)
+++ trunk/src/components/kinectViewer/build/CMakeLists.txt 2013-07-22 09:01:33 UTC (rev 949)
@@ -8,7 +8,7 @@
SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce ) # Librerias de las que depende el componente
SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
###################
@@ -57,9 +57,9 @@
include_directories(${gtkglextmm_INCLUDE_DIRS})
link_directories(${gtkglextmm_LIBRARY_DIRS})
-#PKG_CHECK_MODULES(gsl REQUIRED gsl)
-#include_directories(${gsl_INCLUDE_DIRS})
-#link_directories(${gsl_LIBRARIES_DIRS})
+PKG_CHECK_MODULES(gsl REQUIRED gsl)
+include_directories(${gsl_INCLUDE_DIRS})
+link_directories(${gsl_LIBRARIES_DIRS})
# FIND AND CHECK OTHER DEPENDENCES
include(${DEPS_DIR}/gearbox/CMakeLists.txt)
More information about the Jderobot-admin
mailing list