[Jderobot-admin] jderobot-r968 - in trunk: . Deps Deps/libxml2 src src/stable src/stable/components src/stable/components/gazeboserver src/stable/components/openniServer src/stable/components/playerserver src/stable/libs src/stable/libs/geometry src/stable/libs/geometry/collada src/stable/libs/visionlib src/testing src/testing/components src/testing/libs

rocapal en jderobot.org rocapal en jderobot.org
Lun Ago 12 11:03:10 CEST 2013


Author: rocapal
Date: 2013-08-12 11:02:10 +0200 (Mon, 12 Aug 2013)
New Revision: 968

Added:
   trunk/Deps/libxml2/
   trunk/Deps/libxml2/CMakeLists.txt
   trunk/src/stable/
   trunk/src/stable/CMakeLists.txt
   trunk/src/stable/components/
   trunk/src/stable/interfaces/
   trunk/src/stable/libs/
   trunk/src/testing/
   trunk/src/testing/CMakeLists.txt
   trunk/src/testing/components/
   trunk/src/testing/components/CMakeLists.txt
   trunk/src/testing/components/alarmgenerator/
   trunk/src/testing/components/android-teleoperator/
   trunk/src/testing/components/basic_component_qt/
   trunk/src/testing/components/basic_server/
   trunk/src/testing/components/bgfglab/
   trunk/src/testing/components/calibrator/
   trunk/src/testing/components/calibratorKinect/
   trunk/src/testing/components/cameraview_icestorm/
   trunk/src/testing/components/cameraview_py/
   trunk/src/testing/components/colortuner/
   trunk/src/testing/components/gazeboserver0.9/
   trunk/src/testing/components/giraffeServer/
   trunk/src/testing/components/giraffeclient/
   trunk/src/testing/components/introrob_qt/
   trunk/src/testing/components/kinectServer/
   trunk/src/testing/components/motiondetection/
   trunk/src/testing/components/naobody/
   trunk/src/testing/components/naooperator/
   trunk/src/testing/components/naoserver/
   trunk/src/testing/components/openniServer-kinect/
   trunk/src/testing/components/teleoperator/
   trunk/src/testing/components/visualHFSM/
   trunk/src/testing/components/wiimoteClient/
   trunk/src/testing/components/wiimoteServer/
   trunk/src/testing/interfaces/
   trunk/src/testing/libs/
   trunk/src/testing/libs/CMakeLists.txt
   trunk/src/testing/libs/bgfgsegmentation/
   trunk/src/testing/libs/colorspacesice/
   trunk/src/testing/libs/jderobotice/
Removed:
   trunk/src/components/
   trunk/src/examples/
   trunk/src/interfaces/
   trunk/src/libs/
   trunk/src/stable/components/alarmgenerator/
   trunk/src/stable/components/android-teleoperator/
   trunk/src/stable/components/basic_component_qt/
   trunk/src/stable/components/basic_server/
   trunk/src/stable/components/bgfglab/
   trunk/src/stable/components/calibrator/
   trunk/src/stable/components/calibratorKinect/
   trunk/src/stable/components/cameraview_icestorm/
   trunk/src/stable/components/cameraview_py/
   trunk/src/stable/components/colortuner/
   trunk/src/stable/components/deprecated/
   trunk/src/stable/components/gazeboserver0.9/
   trunk/src/stable/components/giraffeServer/
   trunk/src/stable/components/giraffeclient/
   trunk/src/stable/components/introrob_qt/
   trunk/src/stable/components/kinectServer/
   trunk/src/stable/components/motiondetection/
   trunk/src/stable/components/naobody/
   trunk/src/stable/components/naooperator/
   trunk/src/stable/components/naoserver/
   trunk/src/stable/components/openniServer-kinect/
   trunk/src/stable/components/teleoperator/
   trunk/src/stable/components/visualHFSM/
   trunk/src/stable/components/wiimoteClient/
   trunk/src/stable/components/wiimoteServer/
   trunk/src/stable/libs/bgfgsegmentation/
   trunk/src/stable/libs/colorspacesice/
   trunk/src/stable/libs/interfaces/
   trunk/src/stable/libs/jderobotice/
Modified:
   trunk/CMakeLists.txt
   trunk/clean_repository
   trunk/src/CMakeLists.txt
   trunk/src/stable/components/CMakeLists.txt
   trunk/src/stable/components/gazeboserver/CMakeLists.txt
   trunk/src/stable/components/openniServer/CMakeLists.txt
   trunk/src/stable/components/playerserver/CMakeLists.txt
   trunk/src/stable/libs/CMakeLists.txt
   trunk/src/stable/libs/geometry/CMakeLists.txt
   trunk/src/stable/libs/geometry/collada/colladaparser.h
   trunk/src/stable/libs/geometry/collada/submalla.h
   trunk/src/stable/libs/visionlib/CMakeLists.txt
Log:
#19 Added stable and testing structure. Refactored CMakeLists


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -9,9 +9,10 @@
 #comprobamos si tenemos gearbox y si no desactivamos todos los componentes que dependan de él
 include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 
-SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/cpp) # Directorio con las interfaces ICE en C++
-SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libs) # Directorio donde se encuentran las librerias propias de jderobot
-SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/slice) # Directorio donde se encuentran las interfaces ICE
+
+SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp) # Directorio con las interfaces ICE en C++
+SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/libs) # Directorio donde se encuentran las librerias propias de jderobot
+SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/slice) # Directorio donde se encuentran las interfaces ICE
 SET( LIBS_NEEDED  colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce ) # Librerias de las que depende el componente
 
 IF( Gearbox_INCLUDE_DIR ) 
@@ -20,26 +21,26 @@
 ENDIF()
 
 
+# MACRO to get the list of subdirectories
+macro(list_subdirectories retval curdir return_relative)
+  file(GLOB sub-dir RELATIVE ${curdir} *)
+  set(list_of_dirs "")
+  foreach(dir ${sub-dir})
+    if(IS_DIRECTORY ${curdir}/${dir})
+      if (${return_relative})
+        if (NOT ${dir} MATCHES "CMakeFiles")
+                set(list_of_dirs ${list_of_dirs} ${dir})
+        endif()
+      else()
+        set(list_of_dirs ${list_of_dirs} ${curdir}/${dir})
+      endif()
+    endif()
+  endforeach()
+  set(${retval} ${list_of_dirs})
+endmacro()
 
-SET( COMPONENTS calibrator  
-		calibratorKinect
-		naooperator         
-		basic_component	   
-		opencvdemo
-		cameraserver         
-		introrob            
-		cameraview
-		recorder
-		cameraview_icestorm
-		kinectViewer        
-		wiimoteClient
-		colortuner 
-		replayController 
-		basic_server
-		remoteConfiguration
-		
-) #Componentes que forman JDErobot
 
+#TODO: Fix the dependencies of GearBox
 IF( Gearbox_INCLUDE_DIR ) 
 	#librerías que dependen de gearbox
 	SET( COMPONENTS  ${COMPONENTS}  bgfglab replayer wiimoteServer)
@@ -127,6 +128,7 @@
 include(${DEPS_DIR}/nite2/CMakeLists.txt)
 include(${DEPS_DIR}/pthread/CMakeLists.txt)
 include(${DEPS_DIR}/libxml++/CMakeLists.txt)
+include(${DEPS_DIR}/libxml2/CMakeLists.txt)
 #include(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/CMakeLists.txt)
 
 
@@ -142,28 +144,23 @@
 #                 #
 ###################
 
-# Install libraries
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/cpp/jderobot/libJderobotInterfaces.so DESTINATION /usr/local/lib/jderobot)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp/jderobot/libJderobotInterfaces.so DESTINATION /usr/local/lib/jderobot)
 
-FOREACH(currentLibFile ${LIBS_NEEDED})
-    SET (new_lib "lib${currentLibFile}.so")
-    MESSAGE("${new_lib}")    
-    INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/libs/${currentLibFile}/${new_lib} DESTINATION /usr/local/lib/jderobot)
-ENDFOREACH(currentLibFile)
+# install all libraries 
+FILE(GLOB LIB_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/libs/*/*.so)
+FOREACH (lib ${LIB_FILES})
+	INSTALL (FILES ${lib} DESTINATION /usr/local/lib/jderobot)
+ENDFOREACH(lib)
 
-# WORKAROUND: copy libcolorspacesmm.so It's needed to change this!
-SET (new lib libcolorspacesmm.so)
-MESSAGE("${new_lib}")
-INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/libs/colorspaces/libcolorspacesmm.so DESTINATION /usr/local/lib/jderobot)
 
-FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/libs/*.h)
+FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/libs/*.h)
 FOREACH(currentSourceFile ${HEADERS_FILES})
     string(REGEX REPLACE ".*/(.*/).*.h" "\\1" new_source1 ${currentSourceFile})
     INSTALL (FILES ${currentSourceFile} DESTINATION /usr/local/include/jderobot/${new_source1})
 ENDFOREACH(currentSourceFile)
 
 # Install libraries headers
-FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/libs/*.h)
+FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/libs/*.h)
 FOREACH(currentSourceFile ${HEADERS_FILES})
 	string(REGEX REPLACE ".*/(.*/).*.h" "\\1" new_source1 ${currentSourceFile})
 	INSTALL (FILES ${currentSourceFile} DESTINATION /usr/local/include/jderobot/${new_source1})
@@ -174,25 +171,25 @@
     #SET(EXIST EXIST-NOTFOUND)
     #find_file(EXIST NAMES ${currentBin} PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/components/${currentBin})
     #IF (EXIST)
-	INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/components/${currentBin}/${currentBin} DESTINATION /usr/local/bin OPTIONAL PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+	INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/${currentBin}/${currentBin} DESTINATION /usr/local/bin OPTIONAL PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
     #ENDIF(EXIST)
     #MESSAGE("${EXIST}")
 ENDFOREACH(currentBin)
 
 # Install interfaces headers
-FILE(GLOB HEADER_INTERFACE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/cpp/jderobot/*.h)
+FILE(GLOB HEADER_INTERFACE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp/jderobot/*.h)
 INSTALL (FILES ${HEADER_INTERFACE_FILES} DESTINATION /usr/local/include/jderobot)
 
 # Install slice
-FILE(GLOB SLICE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/slice/jderobot/*.ice)
+FILE(GLOB SLICE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/slice/jderobot/*.ice)
 INSTALL (FILES ${SLICE_FILES} DESTINATION /usr/local/include/jderobot/slice)
 
 # Install CONF
-FILE(GLOB_RECURSE CONF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/components/*.cfg)
+FILE(GLOB_RECURSE CONF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/*.cfg)
 INSTALL (FILES ${CONF_FILES} DESTINATION /usr/local/share/jderobot/conf)
 
 # Install Glade
-FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/components/*.glade)
+FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/components/*.glade)
 INSTALL (FILES ${GLADE_FILES} DESTINATION /usr/local/share/jderobot/glade)
 
 

Added: trunk/Deps/libxml2/CMakeLists.txt
===================================================================
--- trunk/Deps/libxml2/CMakeLists.txt	                        (rev 0)
+++ trunk/Deps/libxml2/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -0,0 +1,21 @@
+
+
+FIND_PATH( LIBXML2_INCLUDE_DIR NAMES parser.h PATHS ENV C++LIB ENV PATH PATH_SUFFIXES include/libxml2/libxml/)
+IF( LIBXML2_INCLUDE_DIR )
+
+    MESSAGE("*** LIBXML2 ok")
+    FIND_LIBRARY( LIBXML2_LIBRARY1 NAMES xml2 PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
+   
+    SET (LIBXML2_LIBRARIES ${LIBXML2_LIBRARY1} )
+    IF( LIBXML2_LIBRARIES )
+		#MESSAGE("LIBXML2 LIBRARY FOUND IN ${LIBXML2_LIBRARIES}")
+    ENDIF(LIBXML2_LIBRARIES )
+
+ENDIF(LIBXML2_INCLUDE_DIR)
+
+IF (NOT  LIBXML2_INCLUDE_DIR)
+	MESSAGE("*** LIBXML2 not found")
+ENDIF()
+
+link_directories(${LIBXML2_LIBRARIES})
+include_directories(${LIBXML2_INCLUDE_DIR})

Modified: trunk/clean_repository
===================================================================
--- trunk/clean_repository	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/clean_repository	2013-08-12 09:02:10 UTC (rev 968)
@@ -5,40 +5,40 @@
 mv ./doc/paper-autonomous_robots/Makefile /tmp
 
 for file in $mivar; do
-	rm $file
+	rm -f $file
 done
 
 mivar=`du -a | grep Makefile$ | awk '{print $2}'`
 
 
 for file in $mivar; do
-	rm $file
+	rm -f $file
 done
 
 mivar=`du -a | grep CMakeFiles | awk '{print $2}'`
 
 
 for file in $mivar; do
-	rm -r $file
+	rm -fr $file
 done
 
 mivar=`du -a | grep CMakeCache.txt | awk '{print $2}'`
 
 
 for file in $mivar; do
-	rm -r $file
+	rm -fr $file
 done
 
-rm src/interfaces/cpp/jderobot/*
+rm -f src/stable/interfaces/cpp/jderobot/*
 
 mivar=`du -a | grep "cmake_uninstall.cmake$" | awk '{print $2}'`
 
 for file in $mivar; do
-	rm -r $file
+	rm -fr $file
 done
 
-rm src/libs/*/*.so
-rm src/libs/*/*.a
+rm -f src/stable/libs/*/*.so
+rm -f src/stable/libs/*/*.a
 
 
 

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -1,3 +1,5 @@
-add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/interfaces ${CMAKE_CURRENT_SOURCE_DIR}/interfaces)
-add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/libs ${CMAKE_CURRENT_SOURCE_DIR}/libs)
-add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/components ${CMAKE_CURRENT_SOURCE_DIR}/components)
\ No newline at end of file
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/stable ${CMAKE_CURRENT_SOURCE_DIR}/stable)
+
+IF(JDEROBOT_TESTING)
+	add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/testing ${CMAKE_CURRENT_SOURCE_DIR}/testing)
+ENDIF()

Added: trunk/src/stable/CMakeLists.txt
===================================================================
--- trunk/src/stable/CMakeLists.txt	                        (rev 0)
+++ trunk/src/stable/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -0,0 +1,3 @@
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/interfaces ${CMAKE_CURRENT_SOURCE_DIR}/interfaces)
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/libs ${CMAKE_CURRENT_SOURCE_DIR}/libs)
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/components ${CMAKE_CURRENT_SOURCE_DIR}/components)
\ No newline at end of file

Modified: trunk/src/stable/components/CMakeLists.txt
===================================================================
--- trunk/src/components/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/components/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -1,5 +1,6 @@
-#  STRING(REGEX REPLACE ";" "\\\\;" contents "${contents}")
-#  STRING(REGEX REPLACE "\n" ";" contents "${contents}")
-foreach(file ${COMPONENTS})
-    add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-endforeach()
+list_subdirectories( LIST_COMPONENTS ${CMAKE_CURRENT_SOURCE_DIR} 1)
+
+FOREACH (component ${LIST_COMPONENTS})
+        ADD_SUBDIRECTORY (${component})
+ENDFOREACH()
+

Modified: trunk/src/stable/components/gazeboserver/CMakeLists.txt
===================================================================
--- trunk/src/components/gazeboserver/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/components/gazeboserver/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -1,3 +1,6 @@
+
+if (${GAZEBO_COMPILE})
+
 include_directories(
 	${GAZEBO_INCLUDE_DIRS}
     ${INTERFACES_CPP_DIR}
@@ -47,3 +50,5 @@
 	${ZeroCIce_LIBRARIES} 
     ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
     ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)
+
+ENDIF()

Modified: trunk/src/stable/components/openniServer/CMakeLists.txt
===================================================================
--- trunk/src/components/openniServer/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/components/openniServer/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -38,6 +38,8 @@
 			file (COPY ${NITE2_LIB}/NiTE2 DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
 		endif()
 	TARGET_LINK_LIBRARIES(openniServer
+        ${CMAKE_THREAD_LIBS_INIT}
+	${CMAKE_THREAD_LIBS_INIT}
         ${ZeroCIce_LIBRARIES}
         ${opencv_LIBRARIES}
         ${gsl_LIBRARIES}
@@ -45,19 +47,20 @@
         ${LIBS_DIR}/progeo/libprogeo.so
         ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
         ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
-		${OPENNI2_LIB}/libOpenNI2.so
-		${NITE2_LIB}/libNiTE2.so
+	${OPENNI2_LIB}/libOpenNI2.so
+	${NITE2_LIB}/libNiTE2.so
 	)
 	else()
 	TARGET_LINK_LIBRARIES(openniServer
-		${ZeroCIce_LIBRARIES}
-		${opencv_LIBRARIES}
-		${gsl_LIBRARIES}
+        ${CMAKE_THREAD_LIBS_INIT}
+	${ZeroCIce_LIBRARIES}
+	${opencv_LIBRARIES}
+	${gsl_LIBRARIES}
         ${LIBS_DIR}/jderobotutil/libjderobotutil.so
         ${LIBS_DIR}/progeo/libprogeo.so
         ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
         ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
-		${OPENNI2_LIB}/libOpenNI2.so
+	${OPENNI2_LIB}/libOpenNI2.so
 	)
 	endif()
 ENDIF()

Modified: trunk/src/stable/components/playerserver/CMakeLists.txt
===================================================================
--- trunk/src/components/playerserver/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/components/playerserver/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
+IF( Gearbox_INCLUDE_DIR )
+
   SET( SOURCE_FILES playerserver4.cpp)
 	#SET( LIBS_DIR /usr/local/lib/jderobot/)
 
@@ -31,3 +33,4 @@
 #		${LIBS_DIR}/libjderobotutil.so
   )
 
+ENDIF()

Modified: trunk/src/stable/libs/CMakeLists.txt
===================================================================
--- trunk/src/libs/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/libs/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -1,19 +1,5 @@
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/jderobotutil ${CMAKE_CURRENT_SOURCE_DIR}/jderobotutil)
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/bgfgsegmentation ${CMAKE_CURRENT_SOURCE_DIR}/bgfgsegmentation)
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/jderobotice ${CMAKE_CURRENT_SOURCE_DIR}/jderobotice)
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/colorspaces ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces)
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/progeo ${CMAKE_CURRENT_SOURCE_DIR}/progeo)
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/pioneer ${CMAKE_CURRENT_SOURCE_DIR}/pioneer)
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/fuzzylib ${CMAKE_CURRENT_SOURCE_DIR}/fuzzylib)
-##add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/visionlib ${CMAKE_CURRENT_SOURCE_DIR}/visionlib)
-foreach(file ${LIBS_NEEDED})
-    SET (fileAux fileAux-NOTFOUND)
-    find_file(fileAux NAMES lib${file}.so PATHS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-    string(COMPARE EQUAL ${fileAux} "fileAux-NOTFOUND" result)
-    #MESSAGE ( "COMARE ${fileAux} fileAux-NOTFOUND")
-    IF(result)	    
-	    add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-    ENDIF()    
+list_subdirectories( LIST_LIBS ${CMAKE_CURRENT_SOURCE_DIR} 1)
 
-    
-endforeach()
+FOREACH (libs ${LIST_LIBS})
+        ADD_SUBDIRECTORY (${libs})
+ENDFOREACH()

Modified: trunk/src/stable/libs/geometry/CMakeLists.txt
===================================================================
--- trunk/src/libs/geometry/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/libs/geometry/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -1,21 +1,38 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
- 
-PROJECT(libgeometry)
- 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} /usr/include/libxml2/)
 
-set(SRC_FILES math/matriz3x3.cpp  math/matriz4x4.cpp  math/plano.cpp  math/utils.cpp  math/vector2d.cpp  math/vector3.cpp  math/vector2H.cpp math/vector3H.cpp math/Line2D.cpp math/Segment2D.cpp math/Point2D.cpp math/Point3D.cpp math/Line3D.cpp math/Plane3D.cpp math/Segment3D.cpp collada/colladaparser.cpp collada/color.cpp collada/malla.cpp collada/material.cpp collada/submalla.cpp progeo/Progeo.cpp math/segmento.cpp math/recta.cpp) 
- 
-ADD_LIBRARY(geometry SHARED ${SRC_FILES})
+SET(SRC_FILES 
+	math/matriz3x3.cpp  
+	math/matriz4x4.cpp  
+	math/plano.cpp  
+	math/utils.cpp  
+	math/vector2d.cpp 
+	math/vector3.cpp  
+	math/vector2H.cpp 
+	math/vector3H.cpp 
+	math/Line2D.cpp 
+	math/Segment2D.cpp 
+	math/Point2D.cpp 
+	math/Point3D.cpp 
+	math/Line3D.cpp 
+	math/Plane3D.cpp 
+	math/Segment3D.cpp 
+	collada/colladaparser.cpp 
+	collada/color.cpp 
+	collada/malla.cpp 
+	collada/material.cpp 
+	collada/submalla.cpp 
+	progeo/Progeo.cpp 
+	math/segmento.cpp 
+	math/recta.cpp) 
 
-include(FindPkgConfig)
-find_package(Boost COMPONENTS system filesystem REQUIRED)
+ADD_LIBRARY (geometryshare SHARED ${SRC_FILES})
 
-target_link_libraries(geometry tinyxml GLU opencv_core opencv_highgui ${Boost_LIBRARIES})
+SET_TARGET_PROPERTIES (geometryshare PROPERTIES OUTPUT_NAME geometry)
 
-SET_PROPERTY(TARGET geometry PROPERTY SOVERSION 1.0)
- 
-#ADD_LIBRARY(geometry_static STATIC ${SRC_FILES})
+TARGET_LINK_LIBRARIES(geometryshare 
+	${gsl_LIBRARIES}
+	${Boost_LIBRARIES}
+	${OpenCV_LIBRARIES}
+	${GLUT_LIBRARIES}
+	${LIBXML2_LIBRARIES}
+)
 
-#target_link_libraries(geometry_shared tinyxml GLU ) 
-#SET_TARGET_PROPERTIES(geometry_shared geometry_static PROPERTIES OUTPUT_NAME geometry)

Modified: trunk/src/stable/libs/geometry/collada/colladaparser.h
===================================================================
--- trunk/src/libs/geometry/collada/colladaparser.h	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/libs/geometry/collada/colladaparser.h	2013-08-12 09:02:10 UTC (rev 968)
@@ -15,12 +15,12 @@
 #include "submalla.h"
 #include "color.h"
 
-#include "math/utils.h"
-#include "math/matriz4x4.h"
-#include "math/matriz3x3.h"
-#include "math/vector3.h"
-#include "math/plano.h"
-#include "math/segmento.h"
+#include "../math/utils.h"
+#include "../math/matriz4x4.h"
+#include "../math/matriz3x3.h"
+#include "../math/vector3.h"
+#include "../math/plano.h"
+#include "../math/segmento.h"
 
 #include <GL/glut.h>
 #include <GL/gl.h>

Modified: trunk/src/stable/libs/geometry/collada/submalla.h
===================================================================
--- trunk/src/libs/geometry/collada/submalla.h	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/libs/geometry/collada/submalla.h	2013-08-12 09:02:10 UTC (rev 968)
@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include "math/vector3.h"
-#include "math/vector2d.h"
+#include "../math/vector3.h"
+#include "../math/vector2d.h"
 namespace files_3D {
 
     class SubMalla

Modified: trunk/src/stable/libs/visionlib/CMakeLists.txt
===================================================================
--- trunk/src/libs/visionlib/CMakeLists.txt	2013-08-12 06:33:28 UTC (rev 967)
+++ trunk/src/stable/libs/visionlib/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -21,6 +21,5 @@
     ${libgnomecanvasmm_LIBRARIES}
     ${gtkglextmm_LIBRARIES}
     ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
-    ${LIBS_DIR}/jderobotutil/libjderobotutil.so
     ${LIBS_DIR}/progeo/libprogeo.so
 )

Added: trunk/src/testing/CMakeLists.txt
===================================================================
--- trunk/src/testing/CMakeLists.txt	                        (rev 0)
+++ trunk/src/testing/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -0,0 +1,3 @@
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/interfaces ${CMAKE_CURRENT_SOURCE_DIR}/interfaces)
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/libs ${CMAKE_CURRENT_SOURCE_DIR}/libs)
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/components ${CMAKE_CURRENT_SOURCE_DIR}/components)
\ No newline at end of file

Added: trunk/src/testing/components/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/CMakeLists.txt	                        (rev 0)
+++ trunk/src/testing/components/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -0,0 +1,7 @@
+
+list_subdirectories( LIST_COMPONENTS ${CMAKE_CURRENT_SOURCE_DIR} 1)
+
+FOREACH (component ${LIST_COMPONENTS})
+	#MESSAGE(${component})
+	ADD_SUBDIRECTORY (${component})
+ENDFOREACH()

Added: trunk/src/testing/libs/CMakeLists.txt
===================================================================
--- trunk/src/testing/libs/CMakeLists.txt	                        (rev 0)
+++ trunk/src/testing/libs/CMakeLists.txt	2013-08-12 09:02:10 UTC (rev 968)
@@ -0,0 +1,6 @@
+
+list_subdirectories( LIST_LIBS ${CMAKE_CURRENT_SOURCE_DIR} 1)
+
+FOREACH (libs ${LIST_LIBS})
+        ADD_SUBDIRECTORY (${libs})
+ENDFOREACH()



More information about the Jderobot-admin mailing list