[Jderobot-admin] jderobot-r969 - in trunk: . Deps Deps/alut Deps/boost Deps/opengl Deps/tinyxml src/stable/libs/geometry

[rocapal en jderobot.org]

Author: rocapal
Date: 2013-08-12 12:44:11 +0200 (Mon, 12 Aug 2013)
New Revision: 969

Added:
   trunk/Deps/alut/
   trunk/Deps/alut/CMakeLists.txt
   trunk/Deps/boost/
   trunk/Deps/boost/CMakeLists.txt
   trunk/Deps/tinyxml/
   trunk/Deps/tinyxml/CMakeLists.txt
Modified:
   trunk/CMakeLists.txt
   trunk/Deps/opengl/CMakeLists.txt
   trunk/src/stable/libs/geometry/CMakeLists.txt
Log:
#26 Added more dependencies and fixed openGL dependencies


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
+++ trunk/CMakeLists.txt	2013-08-12 10:44:11 UTC (rev 969)
@@ -129,6 +129,10 @@
 include(${DEPS_DIR}/pthread/CMakeLists.txt)
 include(${DEPS_DIR}/libxml++/CMakeLists.txt)
 include(${DEPS_DIR}/libxml2/CMakeLists.txt)
+include(${DEPS_DIR}/boost/CMakeLists.txt)
+include(${DEPS_DIR}/alut/CMakeLists.txt)
+include(${DEPS_DIR}/tinyxml/CMakeLists.txt)
+
 #include(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/CMakeLists.txt)
 
 

Added: trunk/Deps/alut/CMakeLists.txt
===================================================================
--- trunk/Deps/alut/CMakeLists.txt	                        (rev 0)
+++ trunk/Deps/alut/CMakeLists.txt	2013-08-12 10:44:11 UTC (rev 969)
@@ -0,0 +1,16 @@
+include(FindPkgConfig)
+FIND_PATH( alut_INCLUDE_DIR NAMES alut.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES AL)
+
+IF( alut_INCLUDE_DIR )
+    FIND_LIBRARY( alut_LIBRARIES NAMES alut PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64 )
+    IF( alut_LIBRARIES )
+                MESSAGE ("-- ALUT found at ${alut_LIBRARIES}")
+                include_directories(${alut_INCLUDE_DIR})
+                link_directories(${alut_LIBRARIES})
+    ENDIF( alut_LIBRARIES )
+ENDIF(alut_INCLUDE_DIR)
+
+IF(NOT alut_LIBRARIES)
+                MESSAGE ("*** ALUT not found")
+ENDIF()
+

Added: trunk/Deps/boost/CMakeLists.txt
===================================================================
--- trunk/Deps/boost/CMakeLists.txt	                        (rev 0)
+++ trunk/Deps/boost/CMakeLists.txt	2013-08-12 10:44:11 UTC (rev 969)
@@ -0,0 +1,4 @@
+include(FindPkgConfig)
+find_package(Boost COMPONENTS system filesystem REQUIRED)
+INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+

Modified: trunk/Deps/opengl/CMakeLists.txt
===================================================================
--- trunk/Deps/opengl/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
+++ trunk/Deps/opengl/CMakeLists.txt	2013-08-12 10:44:11 UTC (rev 969)
@@ -1,10 +1,13 @@
 include(FindPkgConfig)
 find_package(GLUT)
-include_directories(${GLUT_INCLUDE_DIRS})
-link_directories(${GLUT_LIBRARY_DIRS})
+find_package(OpenGL REQUIRED)
+include_directories(${GLUT_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIRS})
 
+link_directories(${OPENGL_LIBRARIES} ${GLUT_LIBRARY} )
+
+
 IF (GLUT_LIBRARIES) 
-	MESSAGE("OpenGL libraries found at ${GLUT_LIBRARIES}")
+	MESSAGE("OpenGL libraries found at ${GLUT_LIBRARY}")
 ELSE()
 	MESSAGE ("*** OpenGL not found")
 ENDIF()

Added: trunk/Deps/tinyxml/CMakeLists.txt
===================================================================
--- trunk/Deps/tinyxml/CMakeLists.txt	                        (rev 0)
+++ trunk/Deps/tinyxml/CMakeLists.txt	2013-08-12 10:44:11 UTC (rev 969)
@@ -0,0 +1,21 @@
+
+FIND_PATH( LIBTINYXML_INCLUDE_DIR NAMES tinyxml.h PATHS ENV C++LIB ENV PATH PATH_SUFFIXES include/xml/)
+
+IF( LIBTINYXML_INCLUDE_DIR )
+
+    MESSAGE("*** LIBTINYXML ok")
+    FIND_LIBRARY( LIBTINYXML_LIBRARY1 NAMES tinyxml PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
+   
+    SET (LIBTINYXML_LIBRARIES ${LIBTINYXML_LIBRARY1} )
+    IF( LIBTINYXML_LIBRARIES )
+		#MESSAGE("LIBTINYXML LIBRARY FOUND IN ${LIBTINYXML_LIBRARIES}")
+    ENDIF(LIBTINYXML_LIBRARIES )
+
+ENDIF(LIBTINYXML_INCLUDE_DIR)
+
+IF (NOT  LIBTINYXML_INCLUDE_DIR)
+	MESSAGE("*** LIBTINYXML not found")
+ENDIF()
+
+link_directories(${LIBTINYXML_LIBRARIES})
+include_directories(${LIBTINYXML_INCLUDE_DIR})

Modified: trunk/src/stable/libs/geometry/CMakeLists.txt
===================================================================
--- trunk/src/stable/libs/geometry/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
+++ trunk/src/stable/libs/geometry/CMakeLists.txt	2013-08-12 10:44:11 UTC (rev 969)
@@ -32,7 +32,9 @@
 	${gsl_LIBRARIES}
 	${Boost_LIBRARIES}
 	${OpenCV_LIBRARIES}
-	${GLUT_LIBRARIES}
 	${LIBXML2_LIBRARIES}
+        ${LIBTINYXML_LIBRARIES}
+	${OPENGL_LIBRARIES} 
+	${GLUT_LIBRARY}	
 )