[Jderobot-admin] jderobot-r1123 - in trunk/src/stable: components/followBall components/introrob components/naoviewer components/openni1Server components/recorder components/replayController components/teleoperator interfaces/slice/jderobot
lr.morales en jderobot.org
lr.morales en jderobot.org
Dom Dic 1 20:53:54 CET 2013
Author: lr.morales
Date: 2013-12-01 20:53:53 +0100 (Sun, 01 Dec 2013)
New Revision: 1123
Modified:
trunk/src/stable/components/followBall/CMakeLists.txt
trunk/src/stable/components/introrob/CMakeLists.txt
trunk/src/stable/components/naoviewer/CMakeLists.txt
trunk/src/stable/components/openni1Server/CMakeLists.txt
trunk/src/stable/components/recorder/CMakeLists.txt
trunk/src/stable/components/replayController/CMakeLists.txt
trunk/src/stable/components/teleoperator/CMakeLists.txt
trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt
Log:
#122 Modifies some of the CMAKE_CXX_FLAGS to not include libraries in them
Modified: trunk/src/stable/components/followBall/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/followBall/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/components/followBall/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -42,7 +42,7 @@
else()
SET( SOURCE_FILES_FOLLOWBALL viewer.cpp sensors.cpp control.cpp handler.cpp main.cpp )
- SET( CMAKE_CXX_FLAGS "-lpthread -lIce" ) # Opciones para el compilador
+ SET( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador
include_directories (
${INTERFACES_CPP_DIR}
@@ -59,7 +59,6 @@
add_executable (followball ${SOURCE_FILES_FOLLOWBALL})
TARGET_LINK_LIBRARIES ( followball
- ${CMAKE_THREAD_LIBS_INIT}
JderobotInterfaces
jderobotutil
${gtk20_LIBRARIES}
@@ -67,5 +66,6 @@
${libglademm_LIBRARIES}
${ZeroCIce_LIBRARIES}
${OpenCV_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
)
endif()
Modified: trunk/src/stable/components/introrob/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/introrob/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/components/introrob/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -15,7 +15,7 @@
${libgnomecanvasmm_INCLUDE_DIRS}
)
-set( CMAKE_CXX_FLAGS "") #"-lgsl -lgslcblas" ) # Opciones para el compilador
+set( CMAKE_CXX_FLAGS "-Wno-deprecated") # Opciones para el compilador
add_executable (introrob ${SOURCE_FILES})
TARGET_LINK_LIBRARIES(introrob
Modified: trunk/src/stable/components/naoviewer/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/naoviewer/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/components/naoviewer/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -2,7 +2,7 @@
SET( SOURCE_FILES_NAOOPERATOR sensors.cpp control.cpp naooperator.cpp displayer.cpp main.cpp )
-SET( CMAKE_CXX_FLAGS "-ldl -lrt -pthread -lIce" ) # Opciones para el compilador
+SET( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador
include_directories (
${INTERFACES_CPP_DIR}
@@ -24,6 +24,9 @@
${goocanvasmm_LIBRARIES}
${ZeroCIce_LIBRARIES}
${OpenCV_LIBRARIES}
+ "dl"
+ "rt"
+ ${CMAKE_THREAD_LIBS_INIT}
)
ENDIF()
Modified: trunk/src/stable/components/openni1Server/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/openni1Server/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/components/openni1Server/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -10,8 +10,8 @@
${LIBS_DIR}/
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cameras
- ${nite_INCLUDE_DIR}
- ${ni_INCLUDE_DIR}
+ ${nite_INCLUDE_DIR}
+ ${ni_INCLUDE_DIR}
${LIBUSB_INCLUDE_DIRS}
)
@@ -28,7 +28,7 @@
${gsl_LIBRARIES}
${LIBUSB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
- ${LIBUSB_LIBRARY_DIRS}
+ ${LIBUSB_LIBRARY_DIRS}
)
ENDIF()
ENDIF()
Modified: trunk/src/stable/components/recorder/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/recorder/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/components/recorder/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -2,7 +2,7 @@
add_definitions(-DGLADE_DIR="${gladedir}")
-set( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador-lgsl -lgslcblas -lGL -lGLU -lglut -lgazebo
+set( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador
include_directories(
${INTERFACES_CPP_DIR}
@@ -18,7 +18,7 @@
TARGET_LINK_LIBRARIES(recorder
- ${CMAKE_THREAD_LIBS_INIT}
+ ${CMAKE_THREAD_LIBS_INIT}
${GLUT_LIBRARIES}
${OpenCV_LIBRARIES}
${OpenCVGUI_LIBRARIES}
Modified: trunk/src/stable/components/replayController/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/replayController/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/components/replayController/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -6,7 +6,7 @@
add_definitions(-DGLADE_DIR="${gladedir}")
-set( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador-lgsl -lgslcblas -lGL -lGLU -lglut -lgazebo
+set( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador
include_directories(
${INTERFACES_CPP_DIR}
Modified: trunk/src/stable/components/teleoperator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/teleoperator/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/components/teleoperator/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -8,7 +8,7 @@
${CMAKE_CURRENT_SOURCE_DIR}
)
-#set( CMAKE_CXX_FLAGS "" ) # Opciones para el compilador
+set( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador
add_executable (teleoperatorPC ${SOURCE_FILES})
Modified: trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt 2013-12-01 19:29:03 UTC (rev 1122)
+++ trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt 2013-12-01 19:53:53 UTC (rev 1123)
@@ -15,9 +15,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../../cpp/
${CMAKE_CURRENT_SOURCE_DIR}/../../cpp/jderobot
- #${ice_path}
${ice_path_storm}
- #/usr/share/Ice-3.3.1/slice/
)
More information about the Jderobot-admin
mailing list