[Jderobot-admin] jderobot-r1115 - in trunk/src/testing/components/teleoperator: . build

[lr.morales en jderobot.org]

Author: lr.morales
Date: 2013-11-25 00:23:40 +0100 (Mon, 25 Nov 2013)
New Revision: 1115

Modified:
   trunk/src/testing/components/teleoperator/CMakeLists.txt
   trunk/src/testing/components/teleoperator/build/CMakeLists.txt
Log:
#116 CMake adapted to current jderobot build chain


Modified: trunk/src/testing/components/teleoperator/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/teleoperator/CMakeLists.txt	2013-11-24 23:15:50 UTC (rev 1114)
+++ trunk/src/testing/components/teleoperator/CMakeLists.txt	2013-11-24 23:23:40 UTC (rev 1115)
@@ -7,7 +7,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-set( CMAKE_CXX_FLAGS "-lglut -lgsl -lgslcblas -g" ) # Opciones para el compilador
+#set( CMAKE_CXX_FLAGS "" ) # Opciones para el compilador
 
 add_executable (teleoperatorPC  ${SOURCE_FILES})
 
@@ -17,11 +17,10 @@
     ${LIBS_DIR}/visionlib/colorspaces/libcolorspacesmm.so
     ${OpenCV_LIBRARIES}        
     ${OpenCVGUI_LIBRARIES}
-	${ZeroCIce_LIBRARIES}    
-	${gtkmm_LIBRARIES}  
-	${gtkmm3_LIBRARIES}  	
-	${gthread_LIBRARIES}
-	${Gearbox_LIBRARIES}
+    ${ZeroCIce_LIBRARIES}    
+    ${gtkmm_LIBRARIES}  
+    ${gtkmm3_LIBRARIES}     
+    ${gthread_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
 

Modified: trunk/src/testing/components/teleoperator/build/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/teleoperator/build/CMakeLists.txt	2013-11-24 23:15:50 UTC (rev 1114)
+++ trunk/src/testing/components/teleoperator/build/CMakeLists.txt	2013-11-24 23:23:40 UTC (rev 1115)
@@ -5,11 +5,11 @@
 # ENV VARS
 SET(gladedir ./)
 SET (COMPONENT teleoperatorPC)
-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   jderobotutil colorspaces ) # Librerias de las que depende el componente
-SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
+SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../stable/interfaces/cpp) # Directorio con las interfaces ICE en C++
+SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../stable/libs) # Directorio donde se encuentran las librerias propias de jderobot
+SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../stable/interfaces/slice) # Directorio donde se encuentran las interfaces ICE
+SET( LIBS_NEEDED jderobotutil colorspaces ) # Librerias de las que depende el componente
+SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Deps) # Directorio donde se encuentran las dependencias
 
 
 ###################
@@ -34,14 +34,15 @@
 include_directories(${gthread_INCLUDE_DIRS})
 link_directories(${gthread_LIBRARY_DIRS})
 
+FIND_PACKAGE(Threads REQUIRED)
   # FIND AND CHECK OTHER DEPENDENCES
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 
 include_directories(${LIBS_DIR}/progeo)
 
+
   # START RECURSIVE
-add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)