[Jderobot-admin] jderobot-r995 - in trunk: . Deps Deps/gazebo

[frivas en jderobot.org]

Author: frivas
Date: 2013-10-05 19:29:47 +0200 (Sat, 05 Oct 2013)
New Revision: 995

Added:
   trunk/Deps/gazebo/
   trunk/Deps/gazebo/CMakeLists.txt
Modified:
   trunk/CMakeLists.txt
Log:
Issue#59 A new Dep folder have been created to handle the gazebo dependences and this dependences have been changed to quiet instead of required


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-10-04 09:02:23 UTC (rev 994)
+++ trunk/CMakeLists.txt	2013-10-05 17:29:47 UTC (rev 995)
@@ -101,16 +101,9 @@
 include_directories(${gstreamerapp_INCLUDE_DIRS})
 link_directories(${gstreamerapp_LIBRARY_DIRS})
 
-PKG_CHECK_MODULES(GAZEBO REQUIRED gazebo)
-include_directories(${GAZEBO_INCLUDE_DIRS})
-link_directories(${GAZEBO_LIBRARY_DIRS})
-if (GAZEBO_INCLUDE_DIRS STREQUAL "")
-    SET(GAZEBO_COMPILE FALSE)
-else()
-    SET(GAZEBO_COMPILE TRUE)
-endif()
 
 
+
 FOREACH(LibFile ${LIBS_NEEDED})
     link_directories(${LIBS_DIR}/${LibFile})
     MESSAGE("${LIBS_DIR}/${LibFile}")
@@ -118,6 +111,7 @@
 
   # FIND AND CHECK OTHER DEPENDENCES
 
+include(${DEPS_DIR}/gazebo/CMakeLists.txt)
 include(${DEPS_DIR}/fireware/CMakeLists.txt)
 include(${DEPS_DIR}/pcl/CMakeLists.txt)
 include(${DEPS_DIR}/openni/CMakeLists.txt)

Added: trunk/Deps/gazebo/CMakeLists.txt
===================================================================
--- trunk/Deps/gazebo/CMakeLists.txt	                        (rev 0)
+++ trunk/Deps/gazebo/CMakeLists.txt	2013-10-05 17:29:47 UTC (rev 995)
@@ -0,0 +1,11 @@
+PKG_CHECK_MODULES(GAZEBO QUIET gazebo)
+include_directories(${GAZEBO_INCLUDE_DIRS})
+link_directories(${GAZEBO_LIBRARY_DIRS})
+message ("pruebas:${GAZEBO_INCLUDE_DIRS}:")
+if (GAZEBO_INCLUDE_DIRS)
+    SET(GAZEBO_COMPILE TRUE)
+		MESSAGE("*** GAZEBO LIBRARIES FOUND")
+else()
+    SET(GAZEBO_COMPILE FALSE)
+		MESSAGE("*** GAZEBO LIBRARIES NOT FOUND")
+endif()