[Jderobot-admin] jderobot-r1168 - in trunk: . Deps/ice Deps/tinyxml

[rocapal en jderobot.org]

Author: rocapal
Date: 2014-02-18 16:08:06 +0100 (Tue, 18 Feb 2014)
New Revision: 1168

Modified:
   trunk/CMakeLists.txt
   trunk/Deps/ice/CMakeLists.txt
   trunk/Deps/tinyxml/CMakeLists.txt
Log:
#161 set required libs


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2014-02-18 15:07:09 UTC (rev 1167)
+++ trunk/CMakeLists.txt	2014-02-18 15:08:06 UTC (rev 1168)
@@ -61,14 +61,6 @@
 
 include(FindPkgConfig)
 
-PKG_CHECK_MODULES(gstreamer REQUIRED gstreamer-0.10) 
-include_directories(${gstreamer_INCLUDE_DIRS})
-link_directories(${gstreamer_LIBRARY_DIRS})
-
-PKG_CHECK_MODULES(gstreamerapp REQUIRED gstreamer-app-0.10)
-include_directories(${gstreamerapp_INCLUDE_DIRS})
-link_directories(${gstreamerapp_LIBRARY_DIRS})
-
 PKG_CHECK_MODULES(gsl REQUIRED gsl)
 include_directories(${gsl_INCLUDE_DIRS})
 link_directories(${gsl_LIBRARIES_DIRS})
@@ -77,8 +69,6 @@
 include_directories(${eigen_INCLUDE_DIRS})
 
 
-
-
 link_directories(${INTERFACES_CPP_DIR}/jderobot)
 FOREACH(LibFile ${LIBS_NEEDED})
     link_directories(${LIBS_DIR}/${LibFile})

Modified: trunk/Deps/ice/CMakeLists.txt
===================================================================
--- trunk/Deps/ice/CMakeLists.txt	2014-02-18 15:07:09 UTC (rev 1167)
+++ trunk/Deps/ice/CMakeLists.txt	2014-02-18 15:08:06 UTC (rev 1168)
@@ -22,10 +22,10 @@
 	ENDIF( ZeroCIceStorm_LIBRARY )
 
 IF(NOT  ZeroCIceStorm_LIBRARY )
-	MESSAGE("*** IceStorm not found")
+	MESSAGE(FATAL_ERROR "*** IceStorm not found")
 ENDIF()
 
 IF(NOT  ZeroCIceUtil_LIBRARY )
-	MESSAGE("*** IceUtil not found")
+	MESSAGE(FATAL_ERROR "*** IceUtil not found")
 ENDIF()
 

Modified: trunk/Deps/tinyxml/CMakeLists.txt
===================================================================
--- trunk/Deps/tinyxml/CMakeLists.txt	2014-02-18 15:07:09 UTC (rev 1167)
+++ trunk/Deps/tinyxml/CMakeLists.txt	2014-02-18 15:08:06 UTC (rev 1168)
@@ -15,7 +15,7 @@
 ENDIF(LIBTINYXML_INCLUDE_DIR)
 
 IF (NOT  LIBTINYXML_INCLUDE_DIR)
-	MESSAGE("*** LIBTINYXML not found")
+	MESSAGE( FATAL_ERROR "*** LIBTINYXML not found")
 ELSE()
 	link_directories(${LIBTINYXML_LIBRARIES})
 	include_directories(${LIBTINYXML_INCLUDE_DIR})