From 16df9fe120b677585642429b2f36cc9d22d311ab Mon Sep 17 00:00:00 2001 From: Francisco Rivas Date: Sat, 12 Nov 2016 11:19:49 +0100 Subject: [PATCH 1/3] #623 Included cmake config files --- CMakeLists.txt | 53 +++++++++++++++++++ cmake/JdeRobotConfig.cmake.in | 11 ++++ cmake/JdeRobotConfigVersion.cmake.in | 11 ++++ src/drivers/cameraserver/cameraserver.cpp | 2 +- src/drivers/kinect2server/kinect2Server.cpp | 2 +- src/drivers/openniServer/myprogeo.h | 2 +- src/drivers/openniServer/openniServer.cpp | 2 +- .../CMakeLists.txt | 0 .../LICENSE | 0 .../README.md | 0 .../ice.cfg | 0 .../include/easyiceconfig/EasyIce.h | 0 .../include/easyiceconfig/debug.hpp | 0 .../easyiceconfig/hardcodedlocations.h.in | 0 .../include/easyiceconfig/initializer.hpp | 0 .../include/easyiceconfig/injector.hpp | 0 .../include/easyiceconfig/loader.hpp | 0 .../include/easyiceconfig/stdutils.hpp | 0 .../src/demo/demo.cpp | 0 .../src/demo/ice.cfg | 0 .../src/initializer.cpp | 0 .../src/loader.cpp | 0 .../src/tests/test_loader.cpp | 0 .../src/tests/test_stdutils.cpp | 0 src/libs/jderobotViewer/JderobotViewer.h | 2 +- src/libs/jderobotutil/CameraTask.cpp | 2 +- src/libs/{log => logger}/CMakeLists.txt | 0 src/libs/{log => logger}/Logger.cpp | 0 src/libs/{log => logger}/Logger.h | 0 src/libs/ns/ns.h | 2 +- src/libs/parallelIce/cameraClient.h | 2 +- src/libs/parallelIce/laserClient.h | 2 +- src/libs/parallelIce/pointcloudClient.h | 2 +- src/libs/visionlib/CMakeLists.txt | 3 +- .../{cvBlob => cvblob}/CMakeLists.txt | 0 .../visionlib/{cvBlob => cvblob}/cvaux.cpp | 0 .../visionlib/{cvBlob => cvblob}/cvblob.cpp | 0 .../visionlib/{cvBlob => cvblob}/cvblob.h | 0 .../visionlib/{cvBlob => cvblob}/cvcolor.cpp | 0 .../{cvBlob => cvblob}/cvcontour.cpp | 0 .../visionlib/{cvBlob => cvblob}/cvlabel.cpp | 0 .../visionlib/{cvBlob => cvblob}/cvtrack.cpp | 0 .../{cvFast => cvfast}/CMakeLists.txt | 0 .../visionlib/{cvFast => cvfast}/cvfast.cpp | 0 .../visionlib/{cvFast => cvfast}/cvfast.h | 0 src/libs/visionlib/imgAnalyze/image.h | 2 +- src/libs/visionlib/visionlib.h | 2 +- src/tools/3DViewer/main.cpp | 2 +- .../namingService/NamingServiceJdeRobot.h | 2 +- src/tools/namingService/main.cpp | 2 +- src/tools/replayer2/control.h | 2 +- src/tools/rgbdCalibrator/viewer.cpp | 2 +- 52 files changed, 93 insertions(+), 19 deletions(-) create mode 100644 cmake/JdeRobotConfig.cmake.in create mode 100644 cmake/JdeRobotConfigVersion.cmake.in rename src/libs/{easyiceconfig_cpp => easyiceconfig}/CMakeLists.txt (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/LICENSE (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/README.md (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/ice.cfg (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/include/easyiceconfig/EasyIce.h (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/include/easyiceconfig/debug.hpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/include/easyiceconfig/hardcodedlocations.h.in (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/include/easyiceconfig/initializer.hpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/include/easyiceconfig/injector.hpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/include/easyiceconfig/loader.hpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/include/easyiceconfig/stdutils.hpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/src/demo/demo.cpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/src/demo/ice.cfg (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/src/initializer.cpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/src/loader.cpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/src/tests/test_loader.cpp (100%) rename src/libs/{easyiceconfig_cpp => easyiceconfig}/src/tests/test_stdutils.cpp (100%) rename src/libs/{log => logger}/CMakeLists.txt (100%) rename src/libs/{log => logger}/Logger.cpp (100%) rename src/libs/{log => logger}/Logger.h (100%) rename src/libs/visionlib/{cvBlob => cvblob}/CMakeLists.txt (100%) rename src/libs/visionlib/{cvBlob => cvblob}/cvaux.cpp (100%) rename src/libs/visionlib/{cvBlob => cvblob}/cvblob.cpp (100%) rename src/libs/visionlib/{cvBlob => cvblob}/cvblob.h (100%) rename src/libs/visionlib/{cvBlob => cvblob}/cvcolor.cpp (100%) rename src/libs/visionlib/{cvBlob => cvblob}/cvcontour.cpp (100%) rename src/libs/visionlib/{cvBlob => cvblob}/cvlabel.cpp (100%) rename src/libs/visionlib/{cvBlob => cvblob}/cvtrack.cpp (100%) rename src/libs/visionlib/{cvFast => cvfast}/CMakeLists.txt (100%) rename src/libs/visionlib/{cvFast => cvfast}/cvfast.cpp (100%) rename src/libs/visionlib/{cvFast => cvfast}/cvfast.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index aae46b1c4..f07c7a595 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libs) SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/slice) # Main libraries SET( LIBS_NEEDED colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce ) +SET( LIBS_EXTRA easyiceconfig depthLib geometry jderobotHandlers jderobotViewer logger ns resourcelocator xmlParser colorspaces cvblob cvfast imgAnalyze) # 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,50 @@ execute_process( #SET (CPACK_COMPONENTS_ALL Libraries ApplicationData) include (CPack Documentation) + + + + +SET(JdeRobot_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/jderobot ) +SET(ALL_LIB ${LIBS_NEEDED} ${LIBS_EXTRA}) + +foreach (l ${ALL_LIB} ) + if (TARGET ${l}) + FIND_LIBRARY( TEMP_LIBRARY NAMES ${l} PATHS ${CMAKE_INSTALL_PREFIX}/lib/jderobot) + SET(CONF_LIBRARIES ${CONF_LIBRARIES} ${TEMP_LIBRARY}) + unset(TEMP_LIBRARY CACHE) + endif() +endforeach() + + + + + + +SET(JdeRobot_VERSION ${CPACK_DEBIAN_PACKAGE_VERSION}) +#cmake config +configure_file(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfig.cmake" @ONLY) +# ... for the install tree +set(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/jderobot") +configure_file(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JdeRobotConfig.cmake" @ONLY) +# ... for both +configure_file(cmake/JdeRobotConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfigVersion.cmake" @ONLY) + + +if(WIN32 AND NOT CYGWIN) + set(DEF_INSTALL_CMAKE_DIR CMake) +else() + set(DEF_INSTALL_CMAKE_DIR lib/CMake/FooBar) +endif() +set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH + "Installation directory for CMake files") + + +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 new file mode 100644 index 000000000..90f4c7c1e --- /dev/null +++ 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 new file mode 100644 index 000000000..95c15ebc0 --- /dev/null +++ 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/src/drivers/cameraserver/cameraserver.cpp b/src/drivers/cameraserver/cameraserver.cpp index fa99f1354..d6f47608b 100644 --- a/src/drivers/cameraserver/cameraserver.cpp +++ b/src/drivers/cameraserver/cameraserver.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/kinect2server/kinect2Server.cpp b/src/drivers/kinect2server/kinect2Server.cpp index 8c8c5e32f..f76b08aed 100644 --- a/src/drivers/kinect2server/kinect2Server.cpp +++ b/src/drivers/kinect2server/kinect2Server.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/openniServer/myprogeo.h b/src/drivers/openniServer/myprogeo.h index 7f8e949e7..370897aa0 100644 --- a/src/drivers/openniServer/myprogeo.h +++ b/src/drivers/openniServer/myprogeo.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #define MAX_CAMERAS 8 diff --git a/src/drivers/openniServer/openniServer.cpp b/src/drivers/openniServer/openniServer.cpp index bf3598f8b..d7946368d 100644 --- a/src/drivers/openniServer/openniServer.cpp +++ b/src/drivers/openniServer/openniServer.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/libs/easyiceconfig_cpp/CMakeLists.txt b/src/libs/easyiceconfig/CMakeLists.txt similarity index 100% rename from src/libs/easyiceconfig_cpp/CMakeLists.txt rename to src/libs/easyiceconfig/CMakeLists.txt diff --git a/src/libs/easyiceconfig_cpp/LICENSE b/src/libs/easyiceconfig/LICENSE similarity index 100% rename from src/libs/easyiceconfig_cpp/LICENSE rename to src/libs/easyiceconfig/LICENSE diff --git a/src/libs/easyiceconfig_cpp/README.md b/src/libs/easyiceconfig/README.md similarity index 100% rename from src/libs/easyiceconfig_cpp/README.md rename to src/libs/easyiceconfig/README.md diff --git a/src/libs/easyiceconfig_cpp/ice.cfg b/src/libs/easyiceconfig/ice.cfg similarity index 100% rename from src/libs/easyiceconfig_cpp/ice.cfg rename to src/libs/easyiceconfig/ice.cfg diff --git a/src/libs/easyiceconfig_cpp/include/easyiceconfig/EasyIce.h b/src/libs/easyiceconfig/include/easyiceconfig/EasyIce.h similarity index 100% rename from src/libs/easyiceconfig_cpp/include/easyiceconfig/EasyIce.h rename to src/libs/easyiceconfig/include/easyiceconfig/EasyIce.h diff --git a/src/libs/easyiceconfig_cpp/include/easyiceconfig/debug.hpp b/src/libs/easyiceconfig/include/easyiceconfig/debug.hpp similarity index 100% rename from src/libs/easyiceconfig_cpp/include/easyiceconfig/debug.hpp rename to src/libs/easyiceconfig/include/easyiceconfig/debug.hpp diff --git a/src/libs/easyiceconfig_cpp/include/easyiceconfig/hardcodedlocations.h.in b/src/libs/easyiceconfig/include/easyiceconfig/hardcodedlocations.h.in similarity index 100% rename from src/libs/easyiceconfig_cpp/include/easyiceconfig/hardcodedlocations.h.in rename to src/libs/easyiceconfig/include/easyiceconfig/hardcodedlocations.h.in diff --git a/src/libs/easyiceconfig_cpp/include/easyiceconfig/initializer.hpp b/src/libs/easyiceconfig/include/easyiceconfig/initializer.hpp similarity index 100% rename from src/libs/easyiceconfig_cpp/include/easyiceconfig/initializer.hpp rename to src/libs/easyiceconfig/include/easyiceconfig/initializer.hpp diff --git a/src/libs/easyiceconfig_cpp/include/easyiceconfig/injector.hpp b/src/libs/easyiceconfig/include/easyiceconfig/injector.hpp similarity index 100% rename from src/libs/easyiceconfig_cpp/include/easyiceconfig/injector.hpp rename to src/libs/easyiceconfig/include/easyiceconfig/injector.hpp diff --git a/src/libs/easyiceconfig_cpp/include/easyiceconfig/loader.hpp b/src/libs/easyiceconfig/include/easyiceconfig/loader.hpp similarity index 100% rename from src/libs/easyiceconfig_cpp/include/easyiceconfig/loader.hpp rename to src/libs/easyiceconfig/include/easyiceconfig/loader.hpp diff --git a/src/libs/easyiceconfig_cpp/include/easyiceconfig/stdutils.hpp b/src/libs/easyiceconfig/include/easyiceconfig/stdutils.hpp similarity index 100% rename from src/libs/easyiceconfig_cpp/include/easyiceconfig/stdutils.hpp rename to src/libs/easyiceconfig/include/easyiceconfig/stdutils.hpp diff --git a/src/libs/easyiceconfig_cpp/src/demo/demo.cpp b/src/libs/easyiceconfig/src/demo/demo.cpp similarity index 100% rename from src/libs/easyiceconfig_cpp/src/demo/demo.cpp rename to src/libs/easyiceconfig/src/demo/demo.cpp diff --git a/src/libs/easyiceconfig_cpp/src/demo/ice.cfg b/src/libs/easyiceconfig/src/demo/ice.cfg similarity index 100% rename from src/libs/easyiceconfig_cpp/src/demo/ice.cfg rename to src/libs/easyiceconfig/src/demo/ice.cfg diff --git a/src/libs/easyiceconfig_cpp/src/initializer.cpp b/src/libs/easyiceconfig/src/initializer.cpp similarity index 100% rename from src/libs/easyiceconfig_cpp/src/initializer.cpp rename to src/libs/easyiceconfig/src/initializer.cpp diff --git a/src/libs/easyiceconfig_cpp/src/loader.cpp b/src/libs/easyiceconfig/src/loader.cpp similarity index 100% rename from src/libs/easyiceconfig_cpp/src/loader.cpp rename to src/libs/easyiceconfig/src/loader.cpp diff --git a/src/libs/easyiceconfig_cpp/src/tests/test_loader.cpp b/src/libs/easyiceconfig/src/tests/test_loader.cpp similarity index 100% rename from src/libs/easyiceconfig_cpp/src/tests/test_loader.cpp rename to src/libs/easyiceconfig/src/tests/test_loader.cpp diff --git a/src/libs/easyiceconfig_cpp/src/tests/test_stdutils.cpp b/src/libs/easyiceconfig/src/tests/test_stdutils.cpp similarity index 100% rename from src/libs/easyiceconfig_cpp/src/tests/test_stdutils.cpp rename to src/libs/easyiceconfig/src/tests/test_stdutils.cpp diff --git a/src/libs/jderobotViewer/JderobotViewer.h b/src/libs/jderobotViewer/JderobotViewer.h index 35aac137a..b5fe79ace 100644 --- a/src/libs/jderobotViewer/JderobotViewer.h +++ b/src/libs/jderobotViewer/JderobotViewer.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include diff --git a/src/libs/jderobotutil/CameraTask.cpp b/src/libs/jderobotutil/CameraTask.cpp index b7aa89df4..506f3acda 100644 --- a/src/libs/jderobotutil/CameraTask.cpp +++ b/src/libs/jderobotutil/CameraTask.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include diff --git a/src/libs/log/CMakeLists.txt b/src/libs/logger/CMakeLists.txt similarity index 100% rename from src/libs/log/CMakeLists.txt rename to src/libs/logger/CMakeLists.txt diff --git a/src/libs/log/Logger.cpp b/src/libs/logger/Logger.cpp similarity index 100% rename from src/libs/log/Logger.cpp rename to src/libs/logger/Logger.cpp diff --git a/src/libs/log/Logger.h b/src/libs/logger/Logger.h similarity index 100% rename from src/libs/log/Logger.h rename to src/libs/logger/Logger.h diff --git a/src/libs/ns/ns.h b/src/libs/ns/ns.h index 18e417ec6..afddfa550 100644 --- a/src/libs/ns/ns.h +++ b/src/libs/ns/ns.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include diff --git a/src/libs/parallelIce/cameraClient.h b/src/libs/parallelIce/cameraClient.h index a03cacf29..373135797 100644 --- a/src/libs/parallelIce/cameraClient.h +++ b/src/libs/parallelIce/cameraClient.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include namespace jderobot { diff --git a/src/libs/parallelIce/laserClient.h b/src/libs/parallelIce/laserClient.h index 9cf372ed2..ef48fd227 100644 --- a/src/libs/parallelIce/laserClient.h +++ b/src/libs/parallelIce/laserClient.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace jderobot { diff --git a/src/libs/parallelIce/pointcloudClient.h b/src/libs/parallelIce/pointcloudClient.h index 482965cb4..36bc133d6 100644 --- a/src/libs/parallelIce/pointcloudClient.h +++ b/src/libs/parallelIce/pointcloudClient.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include namespace jderobot { diff --git a/src/libs/visionlib/CMakeLists.txt b/src/libs/visionlib/CMakeLists.txt index 631b26829..c76c8667f 100644 --- 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 b/src/libs/visionlib/cvblob/CMakeLists.txt similarity index 100% rename from src/libs/visionlib/cvBlob/CMakeLists.txt rename to src/libs/visionlib/cvblob/CMakeLists.txt diff --git a/src/libs/visionlib/cvBlob/cvaux.cpp b/src/libs/visionlib/cvblob/cvaux.cpp similarity index 100% rename from src/libs/visionlib/cvBlob/cvaux.cpp rename to src/libs/visionlib/cvblob/cvaux.cpp diff --git a/src/libs/visionlib/cvBlob/cvblob.cpp b/src/libs/visionlib/cvblob/cvblob.cpp similarity index 100% rename from src/libs/visionlib/cvBlob/cvblob.cpp rename to src/libs/visionlib/cvblob/cvblob.cpp diff --git a/src/libs/visionlib/cvBlob/cvblob.h b/src/libs/visionlib/cvblob/cvblob.h similarity index 100% rename from src/libs/visionlib/cvBlob/cvblob.h rename to src/libs/visionlib/cvblob/cvblob.h diff --git a/src/libs/visionlib/cvBlob/cvcolor.cpp b/src/libs/visionlib/cvblob/cvcolor.cpp similarity index 100% rename from src/libs/visionlib/cvBlob/cvcolor.cpp rename to src/libs/visionlib/cvblob/cvcolor.cpp diff --git a/src/libs/visionlib/cvBlob/cvcontour.cpp b/src/libs/visionlib/cvblob/cvcontour.cpp similarity index 100% rename from src/libs/visionlib/cvBlob/cvcontour.cpp rename to src/libs/visionlib/cvblob/cvcontour.cpp diff --git a/src/libs/visionlib/cvBlob/cvlabel.cpp b/src/libs/visionlib/cvblob/cvlabel.cpp similarity index 100% rename from src/libs/visionlib/cvBlob/cvlabel.cpp rename to src/libs/visionlib/cvblob/cvlabel.cpp diff --git a/src/libs/visionlib/cvBlob/cvtrack.cpp b/src/libs/visionlib/cvblob/cvtrack.cpp similarity index 100% rename from src/libs/visionlib/cvBlob/cvtrack.cpp rename to src/libs/visionlib/cvblob/cvtrack.cpp diff --git a/src/libs/visionlib/cvFast/CMakeLists.txt b/src/libs/visionlib/cvfast/CMakeLists.txt similarity index 100% rename from src/libs/visionlib/cvFast/CMakeLists.txt rename to src/libs/visionlib/cvfast/CMakeLists.txt diff --git a/src/libs/visionlib/cvFast/cvfast.cpp b/src/libs/visionlib/cvfast/cvfast.cpp similarity index 100% rename from src/libs/visionlib/cvFast/cvfast.cpp rename to src/libs/visionlib/cvfast/cvfast.cpp diff --git a/src/libs/visionlib/cvFast/cvfast.h b/src/libs/visionlib/cvfast/cvfast.h similarity index 100% rename from src/libs/visionlib/cvFast/cvfast.h rename to src/libs/visionlib/cvfast/cvfast.h diff --git a/src/libs/visionlib/imgAnalyze/image.h b/src/libs/visionlib/imgAnalyze/image.h index b02ef17f2..f44427f2e 100644 --- a/src/libs/visionlib/imgAnalyze/image.h +++ b/src/libs/visionlib/imgAnalyze/image.h @@ -29,7 +29,7 @@ #include #include #include "structs.h" -#include +#include #include "geometry.h" #ifndef I_SQUARE diff --git a/src/libs/visionlib/visionlib.h b/src/libs/visionlib/visionlib.h index e2b2affcb..075670105 100644 --- a/src/libs/visionlib/visionlib.h +++ b/src/libs/visionlib/visionlib.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #endif diff --git a/src/tools/3DViewer/main.cpp b/src/tools/3DViewer/main.cpp index 148bdc67e..56b70bcff 100644 --- a/src/tools/3DViewer/main.cpp +++ b/src/tools/3DViewer/main.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include diff --git a/src/tools/namingService/NamingServiceJdeRobot.h b/src/tools/namingService/NamingServiceJdeRobot.h index 3215eb53e..091419af0 100644 --- a/src/tools/namingService/NamingServiceJdeRobot.h +++ b/src/tools/namingService/NamingServiceJdeRobot.h @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include #include diff --git a/src/tools/namingService/main.cpp b/src/tools/namingService/main.cpp index a23c93713..10a057f85 100644 --- a/src/tools/namingService/main.cpp +++ b/src/tools/namingService/main.cpp @@ -26,7 +26,7 @@ #include "pthread.h" #include -#include +#include #include "NamingServiceJdeRobot.h" diff --git a/src/tools/replayer2/control.h b/src/tools/replayer2/control.h index c5826a9c4..7cadd2ae0 100644 --- a/src/tools/replayer2/control.h +++ b/src/tools/replayer2/control.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/src/tools/rgbdCalibrator/viewer.cpp b/src/tools/rgbdCalibrator/viewer.cpp index 74732732b..2e4de1e58 100644 --- a/src/tools/rgbdCalibrator/viewer.cpp +++ b/src/tools/rgbdCalibrator/viewer.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #define DEGTORAD (3.14159264 / 180.0) From 32b9c1e1d31946cfc95711538ba3c71f547a4be3 Mon Sep 17 00:00:00 2001 From: Francisco Rivas Date: Sun, 13 Nov 2016 12:25:46 +0100 Subject: [PATCH 2/3] #623 Included cmake config files --- CMakeLists.txt | 39 +++++----------------------- cmake/JdeRobotInstallConfig.cmake.in | 21 +++++++++++++++ 2 files changed, 28 insertions(+), 32 deletions(-) create mode 100644 cmake/JdeRobotInstallConfig.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index f07c7a595..62d74d2dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,8 +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_EXTRA easyiceconfig depthLib geometry jderobotHandlers jderobotViewer logger ns resourcelocator xmlParser colorspaces cvblob cvfast imgAnalyze) +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}) @@ -363,42 +363,17 @@ include (CPack Documentation) SET(JdeRobot_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/jderobot ) -SET(ALL_LIB ${LIBS_NEEDED} ${LIBS_EXTRA}) - -foreach (l ${ALL_LIB} ) +SET(ALL_LIBS ${LIBS_NEEDED} ${LIBS_EXTRA}) +foreach (l ${ALL_LIBS} ) if (TARGET ${l}) - FIND_LIBRARY( TEMP_LIBRARY NAMES ${l} PATHS ${CMAKE_INSTALL_PREFIX}/lib/jderobot) - SET(CONF_LIBRARIES ${CONF_LIBRARIES} ${TEMP_LIBRARY}) - unset(TEMP_LIBRARY CACHE) + SET(JdeRobot_LIBS_NAMES ${JdeRobot_LIBS_NAMES} ${l}) endif() endforeach() - - - - -SET(JdeRobot_VERSION ${CPACK_DEBIAN_PACKAGE_VERSION}) -#cmake config -configure_file(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfig.cmake" @ONLY) -# ... for the install tree -set(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/jderobot") -configure_file(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JdeRobotConfig.cmake" @ONLY) -# ... for both -configure_file(cmake/JdeRobotConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfigVersion.cmake" @ONLY) - - -if(WIN32 AND NOT CYGWIN) - set(DEF_INSTALL_CMAKE_DIR CMake) -else() - set(DEF_INSTALL_CMAKE_DIR lib/CMake/FooBar) -endif() -set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH - "Installation directory for CMake files") - - +configure_file(cmake/JdeRobotInstallConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotInstallConfig.cmake" @ONLY) +install (SCRIPT "${CMAKE_SOURCE_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" diff --git a/cmake/JdeRobotInstallConfig.cmake.in b/cmake/JdeRobotInstallConfig.cmake.in new file mode 100644 index 000000000..8a9ff0906 --- /dev/null +++ b/cmake/JdeRobotInstallConfig.cmake.in @@ -0,0 +1,21 @@ +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(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(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfig.cmake" @ONLY) +# ... for the install tree +configure_file(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JdeRobotConfig.cmake" @ONLY) +# ... for both +configure_file(cmake/JdeRobotConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfigVersion.cmake" @ONLY) From 84026c5980259a6aa448e5b66a8a3b7f3d3ae090 Mon Sep 17 00:00:00 2001 From: Francisco Rivas Date: Sun, 22 Jan 2017 12:36:49 +0100 Subject: [PATCH 3/3] Fixed installation from custom build path --- CMakeLists.txt | 4 ++-- cmake/JdeRobotInstallConfig.cmake.in | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62d74d2dc..243fa30df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -371,8 +371,8 @@ foreach (l ${ALL_LIBS} ) endforeach() -configure_file(cmake/JdeRobotInstallConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotInstallConfig.cmake" @ONLY) -install (SCRIPT "${CMAKE_SOURCE_DIR}/JdeRobotInstallConfig.cmake") +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" diff --git a/cmake/JdeRobotInstallConfig.cmake.in b/cmake/JdeRobotInstallConfig.cmake.in index 8a9ff0906..ab5e237fa 100644 --- a/cmake/JdeRobotInstallConfig.cmake.in +++ b/cmake/JdeRobotInstallConfig.cmake.in @@ -4,6 +4,7 @@ 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} ) @@ -14,8 +15,8 @@ endforeach() SET(JdeRobot_VERSION ${CPACK_DEBIAN_PACKAGE_VERSION}) #cmake config -configure_file(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfig.cmake" @ONLY) +configure_file(${JDEROBOT_SOURCE_DIR}/cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfig.cmake" @ONLY) # ... for the install tree -configure_file(cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JdeRobotConfig.cmake" @ONLY) +configure_file(${JDEROBOT_SOURCE_DIR}/cmake/JdeRobotConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JdeRobotConfig.cmake" @ONLY) # ... for both -configure_file(cmake/JdeRobotConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfigVersion.cmake" @ONLY) +configure_file(${JDEROBOT_SOURCE_DIR}/cmake/JdeRobotConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/JdeRobotConfigVersion.cmake" @ONLY)