JdeRobot · fqez · Jan 28, 2017 · Nov 12, 2016 · Nov 13, 2016 · Jan 22, 2017
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,8 @@ SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libs)
 # Folder ICE interface definitions
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/slice)
 # Main libraries
-SET( LIBS_NEEDED  colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce )
+SET( LIBS_NEEDED  jderobotutil colorspaces colorspacesmm easyiceconfig parallelIce depthLib geometry logger ns progeo pioneer fuzzylib  )
+SET( LIBS_EXTRA     jderobotHandlers jderobotViewer   resourcelocator xmlParser cvblob cvfast imgAnalyze JderobotInterfaces)
 
 # Create directories if necessary
 file(MAKE_DIRECTORY ${INTERFACES_PYTHON_DIR})
@@ -224,6 +225,11 @@ INSTALL (FILES ${GLADE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot)
 
 
+
+
+
+
+
 #file(WRITE dummy_main1.c "int main(int argc, char** argv){return 0;}")
 #add_executable(dummy_main1 dummy_main1.c)
 #INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/dummy_main1 DESTINATION /tmp COMPONENT deps OPTIONAL PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
@@ -352,3 +358,25 @@ execute_process(
 
 #SET (CPACK_COMPONENTS_ALL Libraries ApplicationData)
 include (CPack Documentation)
+
+
+
+
+SET(JdeRobot_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/jderobot )
+SET(ALL_LIBS  ${LIBS_NEEDED} ${LIBS_EXTRA})
+foreach (l ${ALL_LIBS} )
+	if (TARGET ${l})
+		SET(JdeRobot_LIBS_NAMES ${JdeRobot_LIBS_NAMES} ${l})
+	endif()
+endforeach()
+
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/JdeRobotInstallConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotInstallConfig.cmake" @ONLY)
+install (SCRIPT "${PROJECT_BINARY_DIR}/JdeRobotInstallConfig.cmake")
+SET(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/share/jderobot)
+install(FILES
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JdeRobotConfig.cmake"
+  "${PROJECT_BINARY_DIR}/JdeRobotConfigVersion.cmake"
+  DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
+
+
diff --git a/cmake/JdeRobotConfig.cmake.in b/cmake/JdeRobotConfig.cmake.in
@@ -0,0 +1,11 @@
+# - Config file for the JdeRobot package
+# It defines the following variables
+#  JdeRobot_INCLUDE_DIRS - include directories for JdeRobot
+#  JdeRobot_LIBRARIES    - libraries to link against
+#  JdeRobot_EXECUTABLE   - the bar executable
+
+# Compute paths
+get_filename_component(JdeRobot_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(JdeRobot_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
+set(JdeRobot_LIBRARIES "@CONF_LIBRARIES@")
+
diff --git a/cmake/JdeRobotConfigVersion.cmake.in b/cmake/JdeRobotConfigVersion.cmake.in
@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@JdeRobot_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
diff --git a/cmake/JdeRobotInstallConfig.cmake.in b/cmake/JdeRobotInstallConfig.cmake.in
@@ -0,0 +1,22 @@
+set(JdeRobot_LIBS_NAMES "@JdeRobot_LIBS_NAMES@")
+set(CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
+set(PROJECT_BINARY_DIR "@PROJECT_BINARY_DIR@")
+set(CPACK_DEBIAN_PACKAGE_VERSION "@CPACK_DEBIAN_PACKAGE_VERSION@")
+set(CMAKE_FIND_LIBRARY_PREFIXES "@CMAKE_FIND_LIBRARY_PREFIXES@")
+set(CMAKE_FIND_LIBRARY_SUFFIXES "@CMAKE_FIND_LIBRARY_SUFFIXES@")
+set(JDEROBOT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
+set(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/jderobot")
+
+foreach (l ${JdeRobot_LIBS_NAMES} )
+    	FIND_LIBRARY( TEMP_LIBRARY NAMES ${l} PATHS ${CMAKE_INSTALL_PREFIX}/lib/jderobot)
+	SET(CONF_LIBRARIES ${CONF_LIBRARIES} ${TEMP_LIBRARY})
+	unset(TEMP_LIBRARY CACHE)
+endforeach()
+
+SET(JdeRobot_VERSION ${CPACK_DEBIAN_PACKAGE_VERSION})
+#cmake config
+configure_file(${JDEROBOT_SOURCE_DIR}/cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfig.cmake" @ONLY)
+# ... for the install tree
+configure_file(${JDEROBOT_SOURCE_DIR}/cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JdeRobotConfig.cmake" @ONLY)
+# ... for both
+configure_file(${JDEROBOT_SOURCE_DIR}/cmake/JdeRobotConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfigVersion.cmake" @ONLY)
diff --git a/src/drivers/cameraserver/cameraserver.cpp b/src/drivers/cameraserver/cameraserver.cpp
@@ -43,7 +43,7 @@
 #include <list>
 
 #include <zlib.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <jderobotutil/CameraHandler.h>
 #include <jderobotutil/CameraTask.h>
 #include <ns/ns.h>

diff --git a/src/drivers/kinect2server/kinect2Server.cpp b/src/drivers/kinect2server/kinect2Server.cpp
@@ -40,7 +40,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <signal.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <ns/ns.h>
 #include <iostream>
 #include <signal.h>

diff --git a/src/drivers/openniServer/myprogeo.h b/src/drivers/openniServer/myprogeo.h
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 
 
 #define MAX_CAMERAS 8

diff --git a/src/drivers/openniServer/openniServer.cpp b/src/drivers/openniServer/openniServer.cpp
@@ -44,7 +44,7 @@
 #include <opencv2/imgproc/imgproc_c.h>
 #include <opencv2/video/background_segm.hpp>
 #include <signal.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <ns/ns.h>
 #include <zlib.h>
 #include <openssl/md5.h>

diff --git a/src/libs/easyiceconfig_cpp/CMakeLists.txt → src/libs/easyiceconfig/CMakeLists.txt b/src/libs/easyiceconfig_cpp/CMakeLists.txt → src/libs/easyiceconfig/CMakeLists.txt
diff --git a/src/libs/easyiceconfig_cpp/LICENSE → src/libs/easyiceconfig/LICENSE b/src/libs/easyiceconfig_cpp/LICENSE → src/libs/easyiceconfig/LICENSE
diff --git a/src/libs/easyiceconfig_cpp/README.md → src/libs/easyiceconfig/README.md b/src/libs/easyiceconfig_cpp/README.md → src/libs/easyiceconfig/README.md
diff --git a/src/libs/easyiceconfig_cpp/ice.cfg → src/libs/easyiceconfig/ice.cfg b/src/libs/easyiceconfig_cpp/ice.cfg → src/libs/easyiceconfig/ice.cfg
diff --git a/...onfig_cpp/include/easyiceconfig/EasyIce.h → ...iceconfig/include/easyiceconfig/EasyIce.h b/...onfig_cpp/include/easyiceconfig/EasyIce.h → ...iceconfig/include/easyiceconfig/EasyIce.h
diff --git a/...onfig_cpp/include/easyiceconfig/debug.hpp → ...iceconfig/include/easyiceconfig/debug.hpp b/...onfig_cpp/include/easyiceconfig/debug.hpp → ...iceconfig/include/easyiceconfig/debug.hpp
diff --git a/...ude/easyiceconfig/hardcodedlocations.h.in → ...ude/easyiceconfig/hardcodedlocations.h.in b/...ude/easyiceconfig/hardcodedlocations.h.in → ...ude/easyiceconfig/hardcodedlocations.h.in
diff --git a/...cpp/include/easyiceconfig/initializer.hpp → ...fig/include/easyiceconfig/initializer.hpp b/...cpp/include/easyiceconfig/initializer.hpp → ...fig/include/easyiceconfig/initializer.hpp
diff --git a/...ig_cpp/include/easyiceconfig/injector.hpp → ...config/include/easyiceconfig/injector.hpp b/...ig_cpp/include/easyiceconfig/injector.hpp → ...config/include/easyiceconfig/injector.hpp
diff --git a/...nfig_cpp/include/easyiceconfig/loader.hpp → ...ceconfig/include/easyiceconfig/loader.hpp b/...nfig_cpp/include/easyiceconfig/loader.hpp → ...ceconfig/include/easyiceconfig/loader.hpp
diff --git a/...ig_cpp/include/easyiceconfig/stdutils.hpp → ...config/include/easyiceconfig/stdutils.hpp b/...ig_cpp/include/easyiceconfig/stdutils.hpp → ...config/include/easyiceconfig/stdutils.hpp
diff --git a/src/libs/easyiceconfig_cpp/src/demo/demo.cpp → src/libs/easyiceconfig/src/demo/demo.cpp b/src/libs/easyiceconfig_cpp/src/demo/demo.cpp → src/libs/easyiceconfig/src/demo/demo.cpp
diff --git a/src/libs/easyiceconfig_cpp/src/demo/ice.cfg → src/libs/easyiceconfig/src/demo/ice.cfg b/src/libs/easyiceconfig_cpp/src/demo/ice.cfg → src/libs/easyiceconfig/src/demo/ice.cfg
diff --git a/...ibs/easyiceconfig_cpp/src/initializer.cpp → src/libs/easyiceconfig/src/initializer.cpp b/...ibs/easyiceconfig_cpp/src/initializer.cpp → src/libs/easyiceconfig/src/initializer.cpp
diff --git a/src/libs/easyiceconfig_cpp/src/loader.cpp → src/libs/easyiceconfig/src/loader.cpp b/src/libs/easyiceconfig_cpp/src/loader.cpp → src/libs/easyiceconfig/src/loader.cpp
diff --git a/...syiceconfig_cpp/src/tests/test_loader.cpp → ...s/easyiceconfig/src/tests/test_loader.cpp b/...syiceconfig_cpp/src/tests/test_loader.cpp → ...s/easyiceconfig/src/tests/test_loader.cpp
diff --git a/...iceconfig_cpp/src/tests/test_stdutils.cpp → ...easyiceconfig/src/tests/test_stdutils.cpp b/...iceconfig_cpp/src/tests/test_stdutils.cpp → ...easyiceconfig/src/tests/test_stdutils.cpp
diff --git a/src/libs/jderobotViewer/JderobotViewer.h b/src/libs/jderobotViewer/JderobotViewer.h
@@ -14,7 +14,7 @@
 #include <pcl/common/common_headers.h>
 #include <pcl/visualization/pcl_visualizer.h>
 #include <boost/interprocess/sync/interprocess_semaphore.hpp>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <opencv2/core/core.hpp>
 
 

diff --git a/src/libs/jderobotutil/CameraTask.cpp b/src/libs/jderobotutil/CameraTask.cpp
@@ -9,7 +9,7 @@
 #include <openssl/md5.h>
 #include <zlib.h>
 #include <visionlib/colorspaces/colorspacesmm.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <iomanip>
 
 

diff --git a/src/libs/log/CMakeLists.txt → src/libs/logger/CMakeLists.txt b/src/libs/log/CMakeLists.txt → src/libs/logger/CMakeLists.txt
diff --git a/src/libs/log/Logger.cpp → src/libs/logger/Logger.cpp b/src/libs/log/Logger.cpp → src/libs/logger/Logger.cpp
diff --git a/src/libs/log/Logger.h → src/libs/logger/Logger.h b/src/libs/log/Logger.h → src/libs/logger/Logger.h
diff --git a/src/libs/ns/ns.h b/src/libs/ns/ns.h
@@ -23,7 +23,7 @@
 
 
 #include <namingService.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include <boost/lexical_cast.hpp>

diff --git a/src/libs/parallelIce/cameraClient.h b/src/libs/parallelIce/cameraClient.h
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <fstream>
 #include <climits>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 
 namespace jderobot {
 

diff --git a/src/libs/parallelIce/laserClient.h b/src/libs/parallelIce/laserClient.h
@@ -29,7 +29,7 @@
 #include <cv.h>
 #include <sstream>
 #include <fstream>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 
 namespace jderobot {
 

diff --git a/src/libs/parallelIce/pointcloudClient.h b/src/libs/parallelIce/pointcloudClient.h
@@ -30,7 +30,7 @@
 #include <cv.h>
 #include <sstream>
 #include <fstream>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 
 namespace jderobot {
 

diff --git a/src/libs/visionlib/CMakeLists.txt b/src/libs/visionlib/CMakeLists.txt
@@ -1,8 +1,7 @@
 list_subdirectories( LIST_LIBS ${CMAKE_CURRENT_SOURCE_DIR} 1)
 
+
 FOREACH (libs ${LIST_LIBS})
         ADD_SUBDIRECTORY (${libs})
 ENDFOREACH()
 
-
-
diff --git a/src/libs/visionlib/cvBlob/CMakeLists.txt → src/libs/visionlib/cvblob/CMakeLists.txt b/src/libs/visionlib/cvBlob/CMakeLists.txt → src/libs/visionlib/cvblob/CMakeLists.txt
diff --git a/src/libs/visionlib/cvBlob/cvaux.cpp → src/libs/visionlib/cvblob/cvaux.cpp b/src/libs/visionlib/cvBlob/cvaux.cpp → src/libs/visionlib/cvblob/cvaux.cpp
diff --git a/src/libs/visionlib/cvBlob/cvblob.cpp → src/libs/visionlib/cvblob/cvblob.cpp b/src/libs/visionlib/cvBlob/cvblob.cpp → src/libs/visionlib/cvblob/cvblob.cpp
diff --git a/src/libs/visionlib/cvBlob/cvblob.h → src/libs/visionlib/cvblob/cvblob.h b/src/libs/visionlib/cvBlob/cvblob.h → src/libs/visionlib/cvblob/cvblob.h
diff --git a/src/libs/visionlib/cvBlob/cvcolor.cpp → src/libs/visionlib/cvblob/cvcolor.cpp b/src/libs/visionlib/cvBlob/cvcolor.cpp → src/libs/visionlib/cvblob/cvcolor.cpp
diff --git a/src/libs/visionlib/cvBlob/cvcontour.cpp → src/libs/visionlib/cvblob/cvcontour.cpp b/src/libs/visionlib/cvBlob/cvcontour.cpp → src/libs/visionlib/cvblob/cvcontour.cpp
diff --git a/src/libs/visionlib/cvBlob/cvlabel.cpp → src/libs/visionlib/cvblob/cvlabel.cpp b/src/libs/visionlib/cvBlob/cvlabel.cpp → src/libs/visionlib/cvblob/cvlabel.cpp
diff --git a/src/libs/visionlib/cvBlob/cvtrack.cpp → src/libs/visionlib/cvblob/cvtrack.cpp b/src/libs/visionlib/cvBlob/cvtrack.cpp → src/libs/visionlib/cvblob/cvtrack.cpp
diff --git a/src/libs/visionlib/cvFast/CMakeLists.txt → src/libs/visionlib/cvfast/CMakeLists.txt b/src/libs/visionlib/cvFast/CMakeLists.txt → src/libs/visionlib/cvfast/CMakeLists.txt
diff --git a/src/libs/visionlib/cvFast/cvfast.cpp → src/libs/visionlib/cvfast/cvfast.cpp b/src/libs/visionlib/cvFast/cvfast.cpp → src/libs/visionlib/cvfast/cvfast.cpp
diff --git a/src/libs/visionlib/cvFast/cvfast.h → src/libs/visionlib/cvfast/cvfast.h b/src/libs/visionlib/cvFast/cvfast.h → src/libs/visionlib/cvfast/cvfast.h
diff --git a/src/libs/visionlib/imgAnalyze/image.h b/src/libs/visionlib/imgAnalyze/image.h
@@ -29,7 +29,7 @@
 #include <opencv/cv.h>
 #include <opencv/highgui.h>
 #include "structs.h"
-#include <visionlib/cvFast/cvfast.h>
+#include <visionlib/cvfast/cvfast.h>
 #include "geometry.h"
 
 #ifndef I_SQUARE

diff --git a/src/libs/visionlib/visionlib.h b/src/libs/visionlib/visionlib.h
@@ -5,7 +5,7 @@
 #include <visionlib/imgAnalyze/image.h>
 #include <visionlib/imgAnalyze/structs.h>
 #include <visionlib/imgAnalyze/linesDetection.h>
-#include <visionlib/cvFast/cvfast.h>
+#include <visionlib/cvfast/cvfast.h>
 #include <progeo/progeo.h>
 
 #endif
diff --git a/src/tools/3DViewer/main.cpp b/src/tools/3DViewer/main.cpp
@@ -49,7 +49,7 @@
 #include <list>
 
 #include <zlib.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <jderobot/visualization.h>
 #include <ns/ns.h>
 

diff --git a/src/tools/namingService/NamingServiceJdeRobot.h b/src/tools/namingService/NamingServiceJdeRobot.h
@@ -19,7 +19,7 @@
  */
 
 #include <jderobot/namingService.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <boost/lexical_cast.hpp>
 #include <fstream>
 #include <vector>

diff --git a/src/tools/namingService/main.cpp b/src/tools/namingService/main.cpp
@@ -26,7 +26,7 @@
 
 #include "pthread.h"
 #include <signal.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 
 #include "NamingServiceJdeRobot.h"
 

diff --git a/src/tools/replayer2/control.h b/src/tools/replayer2/control.h
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
-#include <log/Logger.h>
+#include <logger/Logger.h>
 #include <jderobot/replayControl.h>
 
 

diff --git a/src/tools/rgbdCalibrator/viewer.cpp b/src/tools/rgbdCalibrator/viewer.cpp
@@ -24,7 +24,7 @@
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include <boost/filesystem.hpp>
-#include <visionlib/cvBlob/cvblob.h>
+#include <visionlib/cvblob/cvblob.h>
 #include <resourcelocator/gladelocator.hpp>
 
 #define DEGTORAD     (3.14159264 / 180.0)