From 678eff0aef638931882200f24faefa1c20adf718 Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Mon, 17 Apr 2017 10:26:45 +0200 Subject: [PATCH 1/7] [issue #753] Moved interfaces installs to its CMakeLists --- CMakeLists.txt | 34 ++------------------------- src/interfaces/CMakeLists.txt | 44 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42baebc8b..bdc312c5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,24 +39,14 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) # Opciones para el compilador # ENV VARS SET(gladedir ./) SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Deps) # Directory where the dependencies are there -# Folder with ICE cpp interfaces -SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/cpp/jderobot ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/cpp/) -# Folder with ICE python interfaces -SET( INTERFACES_PYTHON_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/python/jderobot ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/python/) -# Folder with ICE java interfaces -SET( INTERFACES_JAVA_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/java/jderobot ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/java/) + # Folder JdeRobot libraries 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 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}) -file(MAKE_DIRECTORY ${INTERFACES_JAVA_DIR}) -file(MAKE_DIRECTORY ${INTERFACES_CPP_DIR}) # MACRO to get the list of subdirectories macro(list_subdirectories retval curdir return_relative) @@ -137,15 +127,6 @@ add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/src) # # ################### -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/libJderobotInterfaces.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core) - -# Install python files -FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/python/*py) -FOREACH(header ${HEADERS_FILES}) - INSTALL(FILES ${header} DESTINATION ${PYTHON_MODULE_PATH}/ COMPONENT core) -ENDFOREACH(header) - -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/python/jderobot/__init__.py DESTINATION ${PYTHON_MODULE_PATH}/jderobot/ COMPONENT core) # install all libraries FILE(GLOB LIB_FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libs/*/*.so*) @@ -195,17 +176,6 @@ ENDFOREACH(currentBin) -# Install interfaces headers -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/cpp/jderobot/ - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot - COMPONENT core - FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp" -) - -# Install slice -FILE(GLOB SLICE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/slice/jderobot/*.ice) -INSTALL (FILES ${SLICE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/slice COMPONENT core) - # Install CONF FILE(GLOB_RECURSE CONF_DRIVER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/*.cfg) FILE(GLOB_RECURSE CONF_TOOL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/*.cfg) diff --git a/src/interfaces/CMakeLists.txt b/src/interfaces/CMakeLists.txt index 0f29b2bb4..2994dd573 100644 --- a/src/interfaces/CMakeLists.txt +++ b/src/interfaces/CMakeLists.txt @@ -1,3 +1,19 @@ +# Folder with ICE cpp interfaces +SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_BINARY_DIR}/cpp/jderobot ${CMAKE_CURRENT_BINARY_DIR}/cpp/) +# Folder with ICE python interfaces +SET( INTERFACES_PYTHON_DIR ${CMAKE_CURRENT_BINARY_DIR}/python/jderobot ${CMAKE_CURRENT_BINARY_DIR}/python/) +# Folder with ICE java interfaces +SET( INTERFACES_JAVA_DIR ${CMAKE_CURRENT_BINARY_DIR}/java/jderobot ${CMAKE_CURRENT_BINARY_DIR}/java/) + +# Folder ICE interface definitions +SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/slice) + +# Create directories if necessary +file(MAKE_DIRECTORY ${INTERFACES_PYTHON_DIR}) +file(MAKE_DIRECTORY ${INTERFACES_JAVA_DIR}) +file(MAKE_DIRECTORY ${INTERFACES_CPP_DIR}) + + set(SLICE_NEW_STYLE "ON") if (NOT DEFINED SLICE_NEW_STYLE) @@ -121,3 +137,31 @@ endif() set(ice_interfaces_INCLUDE_DIRS "${SLICE_CPP_DIR}" CACHE PATH "Find(ice_interfaces)") endif(NOT DEFINED SLICE_NEW_STYLE) + + +################### +# # +# INSTALL # +# # +################### + +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libJderobotInterfaces.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core) + +# Install python files +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_BINARY_DIR}/python/*py) +FOREACH(header ${HEADERS_FILES}) + INSTALL(FILES ${header} DESTINATION ${PYTHON_MODULE_PATH}/ COMPONENT core) +ENDFOREACH(header) + +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/python/jderobot/__init__.py DESTINATION ${PYTHON_MODULE_PATH}/jderobot/ COMPONENT core) + +# Install interfaces headers +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cpp/jderobot/ + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot + COMPONENT core + FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp" +) + +# Install slice +FILE(GLOB SLICE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/slice/jderobot/*.ice) +INSTALL (FILES ${SLICE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/slice COMPONENT core) From 35a0fd0afafd411dce5d8192b3c073516a46fb51 Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Mon, 17 Apr 2017 15:32:10 +0000 Subject: [PATCH 2/7] [issue #753] solved bug in installation of interfaces --- CMakeLists.txt | 15 +++++++++++++-- src/interfaces/CMakeLists.txt | 17 ++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdc312c5d..7da2a42e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,14 +39,25 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) # Opciones para el compilador # ENV VARS SET(gladedir ./) SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Deps) # Directory where the dependencies are there - +# Folder with ICE cpp interfaces +SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/cpp/jderobot ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/cpp/) +# Folder with ICE python interfaces +SET( INTERFACES_PYTHON_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/python/jderobot ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/python/) +# Folder with ICE java interfaces +SET( INTERFACES_JAVA_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/java/jderobot ${CMAKE_CURRENT_BINARY_DIR}/src/interfaces/java/) # Folder JdeRobot libraries 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 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}) +file(MAKE_DIRECTORY ${INTERFACES_JAVA_DIR}) +file(MAKE_DIRECTORY ${INTERFACES_CPP_DIR}) + # MACRO to get the list of subdirectories macro(list_subdirectories retval curdir return_relative) diff --git a/src/interfaces/CMakeLists.txt b/src/interfaces/CMakeLists.txt index 2994dd573..01bc751c4 100644 --- a/src/interfaces/CMakeLists.txt +++ b/src/interfaces/CMakeLists.txt @@ -1,18 +1,5 @@ -# Folder with ICE cpp interfaces -SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_BINARY_DIR}/cpp/jderobot ${CMAKE_CURRENT_BINARY_DIR}/cpp/) -# Folder with ICE python interfaces -SET( INTERFACES_PYTHON_DIR ${CMAKE_CURRENT_BINARY_DIR}/python/jderobot ${CMAKE_CURRENT_BINARY_DIR}/python/) -# Folder with ICE java interfaces -SET( INTERFACES_JAVA_DIR ${CMAKE_CURRENT_BINARY_DIR}/java/jderobot ${CMAKE_CURRENT_BINARY_DIR}/java/) - -# Folder ICE interface definitions -SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/slice) - -# Create directories if necessary -file(MAKE_DIRECTORY ${INTERFACES_PYTHON_DIR}) -file(MAKE_DIRECTORY ${INTERFACES_JAVA_DIR}) -file(MAKE_DIRECTORY ${INTERFACES_CPP_DIR}) - +cmake_minimum_required(VERSION 2.8) +project(jderobotInterfaces) set(SLICE_NEW_STYLE "ON") if (NOT DEFINED SLICE_NEW_STYLE) From 6a37935c0f6957653037e7d29be49b3a2c1a91b0 Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Tue, 18 Apr 2017 07:55:59 +0000 Subject: [PATCH 3/7] [issue #753] Moved glade installs to its CMakeLists --- CMakeLists.txt | 7 ------- src/tools/cameraview/CMakeLists.txt | 3 +++ src/tools/giraffeClient/CMakeLists.txt | 2 ++ src/tools/naoviewer/CMakeLists.txt | 4 ++++ src/tools/navigatorCamera/CMakeLists.txt | 3 ++- src/tools/opencvdemo/CMakeLists.txt | 4 ++++ src/tools/recorder2/CMakeLists.txt | 4 ++++ src/tools/replayController/CMakeLists.txt | 2 ++ src/tools/replayer2/CMakeLists.txt | 3 +++ src/tools/rgbdCalibrator/CMakeLists.txt | 3 +++ src/tools/rgbdManualCalibrator/CMakeLists.txt | 2 ++ src/tools/rgbdViewer/CMakeLists.txt | 3 +++ src/tools/visualHFSM/CMakeLists.txt | 6 ++++++ 13 files changed, 38 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7da2a42e7..d718f5054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,13 +194,6 @@ FILE(GLOB_RECURSE CONF_TOOL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/*.cfg) SET(CONF_FILES ${CONF_COMPONENT_FILES} ${CONF_DRIVER_FILES} ${CONF_TOOL_FILES}) INSTALL (FILES ${CONF_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) -# Install Glade -FILE(GLOB_RECURSE GLADE_DRIVER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/*.glade) -FILE(GLOB_RECURSE GLADE_TOOL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/*.glade) - -SET(GLADE_FILES ${GLADE_COMPONENT_FILES} ${GLADE_DRIVER_FILES} ${GLADE_TOOL_FILES}) -INSTALL (FILES ${GLADE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT core) - # Install Deps cmake's tree INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot) diff --git a/src/tools/cameraview/CMakeLists.txt b/src/tools/cameraview/CMakeLists.txt index adbb81e52..cfeb2cc4c 100644 --- a/src/tools/cameraview/CMakeLists.txt +++ b/src/tools/cameraview/CMakeLists.txt @@ -41,3 +41,6 @@ TARGET_LINK_LIBRARIES(cameraview ${GLOG_LIBRARIES} ) + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/giraffeClient/CMakeLists.txt b/src/tools/giraffeClient/CMakeLists.txt index 416e5d4b9..0a9a1719a 100644 --- a/src/tools/giraffeClient/CMakeLists.txt +++ b/src/tools/giraffeClient/CMakeLists.txt @@ -37,3 +37,5 @@ TARGET_LINK_LIBRARIES(giraffeClient ${GLOG_LIBRARIES} ) + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/giraffeClient.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) \ No newline at end of file diff --git a/src/tools/naoviewer/CMakeLists.txt b/src/tools/naoviewer/CMakeLists.txt index a81f012a4..f9b578c2b 100644 --- a/src/tools/naoviewer/CMakeLists.txt +++ b/src/tools/naoviewer/CMakeLists.txt @@ -32,3 +32,7 @@ TARGET_LINK_LIBRARIES ( naooperator ) ENDIF() + + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/main_gui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/navigatorCamera/CMakeLists.txt b/src/tools/navigatorCamera/CMakeLists.txt index 389b7cd38..9329c6de9 100644 --- a/src/tools/navigatorCamera/CMakeLists.txt +++ b/src/tools/navigatorCamera/CMakeLists.txt @@ -42,4 +42,5 @@ TARGET_LINK_LIBRARIES(navigatorCamera ${GLOG_LIBRARIES} ) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/myimage.png DESTINATION /usr/local/share/jderobot/glade/ COMPONENT core) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/myimage.png DESTINATION /usr/local/share/jderobot/glade/ ) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/navigatorCamera.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade ) diff --git a/src/tools/opencvdemo/CMakeLists.txt b/src/tools/opencvdemo/CMakeLists.txt index d9ce448c0..880b2bd6a 100644 --- a/src/tools/opencvdemo/CMakeLists.txt +++ b/src/tools/opencvdemo/CMakeLists.txt @@ -35,3 +35,7 @@ TARGET_LINK_LIBRARIES(opencvdemo ${GLOG_LIBRARIES} ) + + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/recorder2/CMakeLists.txt b/src/tools/recorder2/CMakeLists.txt index ba7820cec..638057d8b 100644 --- a/src/tools/recorder2/CMakeLists.txt +++ b/src/tools/recorder2/CMakeLists.txt @@ -56,3 +56,7 @@ TARGET_LINK_LIBRARIES(recorder2 ${resourcelocator_LIBRARIES} ${GLOG_LIBRARIES} ) + + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/recordergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/replayController/CMakeLists.txt b/src/tools/replayController/CMakeLists.txt index ab096721c..d3c7a2a43 100644 --- a/src/tools/replayController/CMakeLists.txt +++ b/src/tools/replayController/CMakeLists.txt @@ -44,3 +44,5 @@ TARGET_LINK_LIBRARIES(replayController ${GLOG_LIBRARIES} ) + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayControllerGui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/replayer2/CMakeLists.txt b/src/tools/replayer2/CMakeLists.txt index 8f348a7aa..f59f4a937 100644 --- a/src/tools/replayer2/CMakeLists.txt +++ b/src/tools/replayer2/CMakeLists.txt @@ -42,3 +42,6 @@ TARGET_LINK_LIBRARIES(replayer2 ${GLOG_LIBRARIES} ) + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/rgbdCalibrator/CMakeLists.txt b/src/tools/rgbdCalibrator/CMakeLists.txt index afc6a404e..b0ffc6b25 100644 --- a/src/tools/rgbdCalibrator/CMakeLists.txt +++ b/src/tools/rgbdCalibrator/CMakeLists.txt @@ -41,3 +41,6 @@ TARGET_LINK_LIBRARIES(rgbdCalibrator ) + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdCalibrator.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/rgbdManualCalibrator/CMakeLists.txt b/src/tools/rgbdManualCalibrator/CMakeLists.txt index 20ec0fd96..542d3e025 100644 --- a/src/tools/rgbdManualCalibrator/CMakeLists.txt +++ b/src/tools/rgbdManualCalibrator/CMakeLists.txt @@ -46,3 +46,5 @@ ${resourcelocator_LIBRARIES} ${GLOG_LIBRARIES} ) + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdManualCalibrator.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/rgbdViewer/CMakeLists.txt b/src/tools/rgbdViewer/CMakeLists.txt index edbfc04c8..97d85cf98 100644 --- a/src/tools/rgbdViewer/CMakeLists.txt +++ b/src/tools/rgbdViewer/CMakeLists.txt @@ -43,3 +43,6 @@ TARGET_LINK_LIBRARIES(rgbdViewer ${GLOG_LIBRARIES} ) + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/visualHFSM/CMakeLists.txt b/src/tools/visualHFSM/CMakeLists.txt index 48b60761a..33cd1a853 100644 --- a/src/tools/visualHFSM/CMakeLists.txt +++ b/src/tools/visualHFSM/CMakeLists.txt @@ -61,3 +61,9 @@ add_custom_command(TARGET visualHFSM POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/getinterfaces.sh $) ENDIF() + + +# Install Glade +FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.glade) + +INSTALL (FILES ${GLADE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) From d935891391a5ae7649cdbf75238bf874036975fe Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Tue, 18 Apr 2017 10:23:50 +0000 Subject: [PATCH 4/7] [issue #753] moved all installations of configuration files to their CMakeLists --- CMakeLists.txt | 8 -------- src/drivers/ardrone_server/CMakeLists.txt | 1 + src/drivers/basic_server/CMakeLists.txt | 1 + src/drivers/cameraserver/CMakeLists.txt | 1 + src/drivers/emSensorDriver/CMakeLists.txt | 2 ++ src/drivers/gazeboserver/plugins/car/CMakeLists.txt | 2 +- src/drivers/gazeboserver/plugins/f1/CMakeLists.txt | 2 +- .../gazeboserver/plugins/flyingKinect2/CMakeLists.txt | 2 +- src/drivers/gazeboserver/plugins/kinect/CMakeLists.txt | 2 +- src/drivers/gazeboserver/plugins/pioneer/CMakeLists.txt | 2 +- .../gazeboserver/plugins/quadrotor2/CMakeLists.txt | 2 +- src/drivers/gazeboserver/plugins/roomba/CMakeLists.txt | 2 +- src/drivers/gazeboserver/plugins/turtlebot/CMakeLists.txt | 2 +- src/drivers/giraffeServer/CMakeLists.txt | 2 ++ src/drivers/kinect2server/CMakeLists.txt | 2 ++ src/drivers/kobuki_driver/CMakeLists.txt | 2 ++ src/drivers/laser_server/CMakeLists.txt | 1 + src/drivers/openni1Server/CMakeLists.txt | 2 ++ src/drivers/openniServer/CMakeLists.txt | 4 ++++ src/drivers/pclRGBDServer/CMakeLists.txt | 2 ++ src/tools/3DViewer/CMakeLists.txt | 5 +++++ src/tools/basic_component/CMakeLists.txt | 3 +++ src/tools/basic_component_py/CMakeLists.txt | 1 + src/tools/cameraCalibrator/CMakeLists.txt | 1 + src/tools/cameraview/CMakeLists.txt | 1 + src/tools/cameraviewjs/CMakeLists.txt | 2 +- src/tools/colorTuner_py/CMakeLists.txt | 3 +++ src/tools/giraffeClient/CMakeLists.txt | 4 +++- src/tools/kobukiViewer/CMakeLists.txt | 1 + src/tools/kobukiviewerjs/CMakeLists.txt | 2 +- src/tools/namingService/CMakeLists.txt | 2 ++ src/tools/naoviewer/CMakeLists.txt | 1 + src/tools/navigatorCamera/CMakeLists.txt | 1 + src/tools/opencvdemo/CMakeLists.txt | 1 + src/tools/recorder2/CMakeLists.txt | 1 + src/tools/replayController/CMakeLists.txt | 1 + src/tools/replayer2/CMakeLists.txt | 1 + src/tools/rgbdCalibrator/CMakeLists.txt | 1 + src/tools/rgbdManualCalibrator/CMakeLists.txt | 2 ++ src/tools/rgbdViewer/CMakeLists.txt | 2 ++ src/tools/rgbdviewerjs/CMakeLists.txt | 2 +- src/tools/uav_viewer/CMakeLists.txt | 2 ++ src/tools/uav_viewer_py/CMakeLists.txt | 1 + src/tools/uavviewerjs/CMakeLists.txt | 2 +- src/tools/visualHFSM/CMakeLists.txt | 1 + 45 files changed, 67 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d718f5054..9dcde1315 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,14 +186,6 @@ FOREACH (currentBin ${LIST_TOOLS}) ENDFOREACH(currentBin) - -# Install CONF -FILE(GLOB_RECURSE CONF_DRIVER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/*.cfg) -FILE(GLOB_RECURSE CONF_TOOL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/*.cfg) - -SET(CONF_FILES ${CONF_COMPONENT_FILES} ${CONF_DRIVER_FILES} ${CONF_TOOL_FILES}) -INSTALL (FILES ${CONF_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) - # Install Deps cmake's tree INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot) diff --git a/src/drivers/ardrone_server/CMakeLists.txt b/src/drivers/ardrone_server/CMakeLists.txt index dbcd6e740..76c219c7f 100644 --- a/src/drivers/ardrone_server/CMakeLists.txt +++ b/src/drivers/ardrone_server/CMakeLists.txt @@ -95,3 +95,4 @@ ELSE() message(WARNING "ardrone_server marked to build, but required dependencies were not met. You should install third party library: ardonelib") ENDIF() +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ardrone_interfaces.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/drivers/basic_server/CMakeLists.txt b/src/drivers/basic_server/CMakeLists.txt index 424582f58..ceb00c047 100644 --- a/src/drivers/basic_server/CMakeLists.txt +++ b/src/drivers/basic_server/CMakeLists.txt @@ -27,3 +27,4 @@ TARGET_LINK_LIBRARIES(basic_server ${ZeroCIce_LIBRARIES} ${easyiceconfig_LIBRARIES} ) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/drivers/cameraserver/CMakeLists.txt b/src/drivers/cameraserver/CMakeLists.txt index 7e89eb7e6..2b1e06e94 100644 --- a/src/drivers/cameraserver/CMakeLists.txt +++ b/src/drivers/cameraserver/CMakeLists.txt @@ -31,3 +31,4 @@ TARGET_LINK_LIBRARIES(cameraserver ns ${GLOG_LIBRARIES} ) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraserver.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/drivers/emSensorDriver/CMakeLists.txt b/src/drivers/emSensorDriver/CMakeLists.txt index 87fb4325d..5025b2905 100644 --- a/src/drivers/emSensorDriver/CMakeLists.txt +++ b/src/drivers/emSensorDriver/CMakeLists.txt @@ -35,6 +35,8 @@ if(wiringPi_LIBRARY) ${wiringPi_LIBRARY} ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/emSensorDriver.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + else() message("Boost thread library is required to build emSensorDriver, skipping driver build.") endif() diff --git a/src/drivers/gazeboserver/plugins/car/CMakeLists.txt b/src/drivers/gazeboserver/plugins/car/CMakeLists.txt index 2b94b3513..3f2a473b7 100644 --- a/src/drivers/gazeboserver/plugins/car/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/car/CMakeLists.txt @@ -36,6 +36,6 @@ target_link_libraries(carPose3D INSTALL (TARGETS carMotors DESTINATION share/jderobot/gazebo/plugins/car/ COMPONENT core) INSTALL (TARGETS carPose3D DESTINATION share/jderobot/gazebo/plugins/car/ COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/car/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) diff --git a/src/drivers/gazeboserver/plugins/f1/CMakeLists.txt b/src/drivers/gazeboserver/plugins/f1/CMakeLists.txt index 06f902720..19d279390 100644 --- a/src/drivers/gazeboserver/plugins/f1/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/f1/CMakeLists.txt @@ -53,6 +53,6 @@ INSTALL (TARGETS motorsF1 laserF1 pose3dF1 camera_dumpF1 COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/cfg/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/f1/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) #MIO endif() diff --git a/src/drivers/gazeboserver/plugins/flyingKinect2/CMakeLists.txt b/src/drivers/gazeboserver/plugins/flyingKinect2/CMakeLists.txt index c5d0f9be0..812b535e8 100644 --- a/src/drivers/gazeboserver/plugins/flyingKinect2/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/flyingKinect2/CMakeLists.txt @@ -58,7 +58,7 @@ target_link_libraries(${PROJECT_NAME} INSTALL (TARGETS ${PROJECT_NAME} DESTINATION share/jderobot/gazebo/plugins/flyingkinect/ COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/flyingkinect/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) else() message(WARNING "flyingKinect requirements unmet: missing PCL_LIBRARIES") diff --git a/src/drivers/gazeboserver/plugins/kinect/CMakeLists.txt b/src/drivers/gazeboserver/plugins/kinect/CMakeLists.txt index 633190471..165b998d5 100644 --- a/src/drivers/gazeboserver/plugins/kinect/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/kinect/CMakeLists.txt @@ -31,6 +31,6 @@ target_link_libraries(kinectPlugin INSTALL (TARGETS kinectPlugin DESTINATION share/jderobot/gazebo/plugins/kinect/ COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/kinect/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) endif() diff --git a/src/drivers/gazeboserver/plugins/pioneer/CMakeLists.txt b/src/drivers/gazeboserver/plugins/pioneer/CMakeLists.txt index c75919466..f777d7d4f 100644 --- a/src/drivers/gazeboserver/plugins/pioneer/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/pioneer/CMakeLists.txt @@ -48,4 +48,4 @@ target_link_libraries(pose3dencoders ${GAZEBO_libraries} INSTALL (TARGETS motors laser camera_dump pose3dencoders pose3d_pioneer DESTINATION share/jderobot/gazebo/plugins/pioneer/ COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/pioneer/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) diff --git a/src/drivers/gazeboserver/plugins/quadrotor2/CMakeLists.txt b/src/drivers/gazeboserver/plugins/quadrotor2/CMakeLists.txt index a0b56454e..2af1fe081 100644 --- a/src/drivers/gazeboserver/plugins/quadrotor2/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/quadrotor2/CMakeLists.txt @@ -82,4 +82,4 @@ set_target_properties(quadrotorplugin2 PROPERTIES COMPILE_FLAGS "-Wall -Wextra") INSTALL (TARGETS quadrotorplugin2 DESTINATION share/jderobot/gazebo/plugins/quadrotor/ COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/quadrotor/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) diff --git a/src/drivers/gazeboserver/plugins/roomba/CMakeLists.txt b/src/drivers/gazeboserver/plugins/roomba/CMakeLists.txt index aca6c82cb..6833f6886 100644 --- a/src/drivers/gazeboserver/plugins/roomba/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/roomba/CMakeLists.txt @@ -51,6 +51,6 @@ set_target_properties(roombaplugin PROPERTIES COMPILE_FLAGS "-Wall -Wextra") INSTALL (TARGETS roombaplugin DESTINATION share/jderobot/gazebo/plugins/roomba/ COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/cfg/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/roomba/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) #MIO endif() diff --git a/src/drivers/gazeboserver/plugins/turtlebot/CMakeLists.txt b/src/drivers/gazeboserver/plugins/turtlebot/CMakeLists.txt index b088ef3c9..d01f9a94c 100644 --- a/src/drivers/gazeboserver/plugins/turtlebot/CMakeLists.txt +++ b/src/drivers/gazeboserver/plugins/turtlebot/CMakeLists.txt @@ -63,6 +63,6 @@ set_target_properties(turtlebotplugin PROPERTIES COMPILE_FLAGS "-Wall -Wextra") INSTALL (TARGETS turtlebotplugin DESTINATION share/jderobot/gazebo/plugins/turtlebot/ COMPONENT core) FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/cfg/*.cfg) -INSTALL (FILES ${CFG_FILES} DESTINATION share/jderobot/gazebo/plugins/turtlebot/ COMPONENT core) +INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) #MIO endif() diff --git a/src/drivers/giraffeServer/CMakeLists.txt b/src/drivers/giraffeServer/CMakeLists.txt index b221789b1..28b773aa0 100644 --- a/src/drivers/giraffeServer/CMakeLists.txt +++ b/src/drivers/giraffeServer/CMakeLists.txt @@ -23,4 +23,6 @@ TARGET_LINK_LIBRARIES(giraffeServer QtCore QtGui ) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/giraffeServer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) endif() + diff --git a/src/drivers/kinect2server/CMakeLists.txt b/src/drivers/kinect2server/CMakeLists.txt index b0ce398fd..ebc6cc743 100644 --- a/src/drivers/kinect2server/CMakeLists.txt +++ b/src/drivers/kinect2server/CMakeLists.txt @@ -40,6 +40,8 @@ link_directories( ${ZLIB_LIBRARIES} ${freenect2_LIBRARIES} ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kinect2server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ELSE() message("Disabled") ENDIF() + diff --git a/src/drivers/kobuki_driver/CMakeLists.txt b/src/drivers/kobuki_driver/CMakeLists.txt index 7ccefe4bc..bd1dc7c58 100644 --- a/src/drivers/kobuki_driver/CMakeLists.txt +++ b/src/drivers/kobuki_driver/CMakeLists.txt @@ -27,4 +27,6 @@ if (${kobuki_COMPILE}) ${ZeroCIce_LIBRARIES} ${easyiceconfig_LIBRARIES} ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kobuki_driver.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ENDIF() + diff --git a/src/drivers/laser_server/CMakeLists.txt b/src/drivers/laser_server/CMakeLists.txt index e523a625d..f0fc14a1a 100644 --- a/src/drivers/laser_server/CMakeLists.txt +++ b/src/drivers/laser_server/CMakeLists.txt @@ -24,3 +24,4 @@ TARGET_LINK_LIBRARIES(${NAME} JderobotInterfaces ${easyiceconfig_LIBRARIES} ) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/laser_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/drivers/openni1Server/CMakeLists.txt b/src/drivers/openni1Server/CMakeLists.txt index c8129f048..719f75cfd 100644 --- a/src/drivers/openni1Server/CMakeLists.txt +++ b/src/drivers/openni1Server/CMakeLists.txt @@ -64,4 +64,6 @@ IF(openni_LIBRARIES AND LIBUSB_INCLUDE_DIRS) progeo ) ENDIF() + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/openni1Server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ENDIF() + diff --git a/src/drivers/openniServer/CMakeLists.txt b/src/drivers/openniServer/CMakeLists.txt index d64e8a14b..efe8b6219 100644 --- a/src/drivers/openniServer/CMakeLists.txt +++ b/src/drivers/openniServer/CMakeLists.txt @@ -89,4 +89,8 @@ IF(OPENNI2_LIB) ${GLOG_LIBRARIES} ) endif() + + FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cfg) + INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) ENDIF() + diff --git a/src/drivers/pclRGBDServer/CMakeLists.txt b/src/drivers/pclRGBDServer/CMakeLists.txt index b1db0d7e4..01e964348 100644 --- a/src/drivers/pclRGBDServer/CMakeLists.txt +++ b/src/drivers/pclRGBDServer/CMakeLists.txt @@ -31,5 +31,7 @@ if(pcl_openni) ${Boost_LIBRARIES} ${easyiceconfig_LIBRARIES} ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kinectServer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) endif() + diff --git a/src/tools/3DViewer/CMakeLists.txt b/src/tools/3DViewer/CMakeLists.txt index e8affa2f6..b5d188981 100644 --- a/src/tools/3DViewer/CMakeLists.txt +++ b/src/tools/3DViewer/CMakeLists.txt @@ -35,3 +35,8 @@ IF (with_pcl) ${GLOG_LIBRARIES} ) ENDIF() + + + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/3DViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/basic_component/CMakeLists.txt b/src/tools/basic_component/CMakeLists.txt index 7faec58a6..81335b041 100644 --- a/src/tools/basic_component/CMakeLists.txt +++ b/src/tools/basic_component/CMakeLists.txt @@ -77,3 +77,6 @@ if (${QT5_COMPILE}) ) ENDIF() + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_component.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/basic_component_py/CMakeLists.txt b/src/tools/basic_component_py/CMakeLists.txt index 49c5cb875..c43a55d60 100644 --- a/src/tools/basic_component_py/CMakeLists.txt +++ b/src/tools/basic_component_py/CMakeLists.txt @@ -25,3 +25,4 @@ INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gui DESTINATION share/jderobot/py # Install resources #INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources DESTINATION share/jderobot/python/basic_component_py COMPONENT tools PATTERN .svn EXCLUDE) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_component_py.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/cameraCalibrator/CMakeLists.txt b/src/tools/cameraCalibrator/CMakeLists.txt index b0cec8530..fd5d693dd 100644 --- a/src/tools/cameraCalibrator/CMakeLists.txt +++ b/src/tools/cameraCalibrator/CMakeLists.txt @@ -32,3 +32,4 @@ add_executable (cameraCalibrator ${SOURCE_FILES}) ${CMAKE_THREAD_LIBS_INIT} ${GLOG_LIBRARIES} ) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraCalibrator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/cameraview/CMakeLists.txt b/src/tools/cameraview/CMakeLists.txt index cfeb2cc4c..ed1c29f9e 100644 --- a/src/tools/cameraview/CMakeLists.txt +++ b/src/tools/cameraview/CMakeLists.txt @@ -44,3 +44,4 @@ TARGET_LINK_LIBRARIES(cameraview INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/cameraviewjs/CMakeLists.txt b/src/tools/cameraviewjs/CMakeLists.txt index 4351284e1..b7e4fe787 100644 --- a/src/tools/cameraviewjs/CMakeLists.txt +++ b/src/tools/cameraviewjs/CMakeLists.txt @@ -9,4 +9,4 @@ IF (NODEJS_COMPILE) INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/public DESTINATION share/jderobot/webtools/cameraviewjs COMPONENT webtools PATTERN .svn EXCLUDE) -ENDIF() \ No newline at end of file +ENDIF() diff --git a/src/tools/colorTuner_py/CMakeLists.txt b/src/tools/colorTuner_py/CMakeLists.txt index b86d7f121..7fa4c50ad 100644 --- a/src/tools/colorTuner_py/CMakeLists.txt +++ b/src/tools/colorTuner_py/CMakeLists.txt @@ -22,3 +22,6 @@ INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sensors DESTINATION share/jderobo # Install Filters INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/filters DESTINATION share/jderobot/python/colorTuner_py COMPONENT tools PATTERN .svn EXCLUDE) + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/colorTuner_py.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/giraffeClient/CMakeLists.txt b/src/tools/giraffeClient/CMakeLists.txt index 0a9a1719a..284a84dc9 100644 --- a/src/tools/giraffeClient/CMakeLists.txt +++ b/src/tools/giraffeClient/CMakeLists.txt @@ -38,4 +38,6 @@ TARGET_LINK_LIBRARIES(giraffeClient ) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/giraffeClient.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) \ No newline at end of file +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/giraffeClient.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/giraffeClient.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/kobukiViewer/CMakeLists.txt b/src/tools/kobukiViewer/CMakeLists.txt index 04a303a9e..b1e0a6330 100644 --- a/src/tools/kobukiViewer/CMakeLists.txt +++ b/src/tools/kobukiViewer/CMakeLists.txt @@ -67,3 +67,4 @@ if (${QT5_COMPILE} AND ${roscpp_FOUND}) ) ENDIF() +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kobukiViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/kobukiviewerjs/CMakeLists.txt b/src/tools/kobukiviewerjs/CMakeLists.txt index 21ba5445b..5195c5dca 100644 --- a/src/tools/kobukiviewerjs/CMakeLists.txt +++ b/src/tools/kobukiviewerjs/CMakeLists.txt @@ -9,4 +9,4 @@ IF (NODEJS_COMPILE) INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/public DESTINATION share/jderobot/webtools/kobukiviewerjs COMPONENT webtools PATTERN .svn EXCLUDE) -ENDIF() \ No newline at end of file +ENDIF() diff --git a/src/tools/namingService/CMakeLists.txt b/src/tools/namingService/CMakeLists.txt index 9d2e9fdfa..69a67bd3c 100644 --- a/src/tools/namingService/CMakeLists.txt +++ b/src/tools/namingService/CMakeLists.txt @@ -26,3 +26,5 @@ TARGET_LINK_LIBRARIES(namingService logger ${GLOG_LIBRARIES} ) + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/namingService.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/naoviewer/CMakeLists.txt b/src/tools/naoviewer/CMakeLists.txt index f9b578c2b..6f51bb0ad 100644 --- a/src/tools/naoviewer/CMakeLists.txt +++ b/src/tools/naoviewer/CMakeLists.txt @@ -36,3 +36,4 @@ ENDIF() INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/main_gui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/naooperator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/navigatorCamera/CMakeLists.txt b/src/tools/navigatorCamera/CMakeLists.txt index 9329c6de9..f88c37a61 100644 --- a/src/tools/navigatorCamera/CMakeLists.txt +++ b/src/tools/navigatorCamera/CMakeLists.txt @@ -44,3 +44,4 @@ TARGET_LINK_LIBRARIES(navigatorCamera INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/myimage.png DESTINATION /usr/local/share/jderobot/glade/ ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/navigatorCamera.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade ) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/navigatorCamera.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/opencvdemo/CMakeLists.txt b/src/tools/opencvdemo/CMakeLists.txt index 880b2bd6a..4b0ea0108 100644 --- a/src/tools/opencvdemo/CMakeLists.txt +++ b/src/tools/opencvdemo/CMakeLists.txt @@ -39,3 +39,4 @@ TARGET_LINK_LIBRARIES(opencvdemo INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/recorder2/CMakeLists.txt b/src/tools/recorder2/CMakeLists.txt index 638057d8b..d3c5cf303 100644 --- a/src/tools/recorder2/CMakeLists.txt +++ b/src/tools/recorder2/CMakeLists.txt @@ -60,3 +60,4 @@ TARGET_LINK_LIBRARIES(recorder2 INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/recordergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/recorder.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/replayController/CMakeLists.txt b/src/tools/replayController/CMakeLists.txt index d3c7a2a43..93c361174 100644 --- a/src/tools/replayController/CMakeLists.txt +++ b/src/tools/replayController/CMakeLists.txt @@ -46,3 +46,4 @@ TARGET_LINK_LIBRARIES(replayController ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayControllerGui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayController.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/replayer2/CMakeLists.txt b/src/tools/replayer2/CMakeLists.txt index f59f4a937..d4bfcceb2 100644 --- a/src/tools/replayer2/CMakeLists.txt +++ b/src/tools/replayer2/CMakeLists.txt @@ -45,3 +45,4 @@ TARGET_LINK_LIBRARIES(replayer2 INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/rgbdCalibrator/CMakeLists.txt b/src/tools/rgbdCalibrator/CMakeLists.txt index b0ffc6b25..f8b61c3a3 100644 --- a/src/tools/rgbdCalibrator/CMakeLists.txt +++ b/src/tools/rgbdCalibrator/CMakeLists.txt @@ -44,3 +44,4 @@ TARGET_LINK_LIBRARIES(rgbdCalibrator INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdCalibrator.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdCalibrator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/rgbdManualCalibrator/CMakeLists.txt b/src/tools/rgbdManualCalibrator/CMakeLists.txt index 542d3e025..cccd08a72 100644 --- a/src/tools/rgbdManualCalibrator/CMakeLists.txt +++ b/src/tools/rgbdManualCalibrator/CMakeLists.txt @@ -48,3 +48,5 @@ ${resourcelocator_LIBRARIES} ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdManualCalibrator.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdManualCalibrator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cam1-mia.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/rgbdViewer/CMakeLists.txt b/src/tools/rgbdViewer/CMakeLists.txt index 97d85cf98..7700043ae 100644 --- a/src/tools/rgbdViewer/CMakeLists.txt +++ b/src/tools/rgbdViewer/CMakeLists.txt @@ -46,3 +46,5 @@ TARGET_LINK_LIBRARIES(rgbdViewer INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camera-0.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/rgbdviewerjs/CMakeLists.txt b/src/tools/rgbdviewerjs/CMakeLists.txt index 1d6ec43bb..d9d6972fa 100644 --- a/src/tools/rgbdviewerjs/CMakeLists.txt +++ b/src/tools/rgbdviewerjs/CMakeLists.txt @@ -9,4 +9,4 @@ IF (NODEJS_COMPILE) INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/public DESTINATION share/jderobot/webtools/rgbdviewerjs COMPONENT webtools PATTERN .svn EXCLUDE) -ENDIF() \ No newline at end of file +ENDIF() diff --git a/src/tools/uav_viewer/CMakeLists.txt b/src/tools/uav_viewer/CMakeLists.txt index 9356a89c0..ab547c0d5 100644 --- a/src/tools/uav_viewer/CMakeLists.txt +++ b/src/tools/uav_viewer/CMakeLists.txt @@ -64,3 +64,5 @@ IF(QT5_COMPILE) ) ENDIF() +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/uav_viewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/uav_viewer_simulated.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/uav_viewer_py/CMakeLists.txt b/src/tools/uav_viewer_py/CMakeLists.txt index 20d0b4a97..71eaddab6 100644 --- a/src/tools/uav_viewer_py/CMakeLists.txt +++ b/src/tools/uav_viewer_py/CMakeLists.txt @@ -24,3 +24,4 @@ ENDFOREACH(header) INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gui DESTINATION share/jderobot/python/uav_viewer_py COMPONENT tools PATTERN .svn EXCLUDE) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/uav_viewer_py.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/uavviewerjs/CMakeLists.txt b/src/tools/uavviewerjs/CMakeLists.txt index 89871f0a5..dbae17f9f 100644 --- a/src/tools/uavviewerjs/CMakeLists.txt +++ b/src/tools/uavviewerjs/CMakeLists.txt @@ -9,4 +9,4 @@ IF (NODEJS_COMPILE) INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/public DESTINATION share/jderobot/webtools/uavviewerjs COMPONENT webtools PATTERN .svn EXCLUDE) -ENDIF() \ No newline at end of file +ENDIF() diff --git a/src/tools/visualHFSM/CMakeLists.txt b/src/tools/visualHFSM/CMakeLists.txt index 33cd1a853..b13d955b2 100644 --- a/src/tools/visualHFSM/CMakeLists.txt +++ b/src/tools/visualHFSM/CMakeLists.txt @@ -67,3 +67,4 @@ ENDIF() FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.glade) INSTALL (FILES ${GLADE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) + From 6c144e9ad603fb1b2f1ed3d7374ea358fddbbed3 Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Thu, 20 Apr 2017 06:54:29 +0000 Subject: [PATCH 5/7] [issue #753] moved installations of .h files to their CMakeLists --- CMakeLists.txt | 14 -------------- src/libs/depthLib/CMakeLists.txt | 6 ++++++ src/libs/fuzzylib/CMakeLists.txt | 5 +++++ src/libs/geometry/CMakeLists.txt | 18 ++++++++++++++++++ src/libs/jderobotHandlers/CMakeLists.txt | 13 +++++++++++++ src/libs/jderobotViewer/CMakeLists.txt | 5 +++++ src/libs/jderobotutil/CMakeLists.txt | 6 ++++++ src/libs/logger/CMakeLists.txt | 4 ++++ src/libs/ns/CMakeLists.txt | 5 +++++ src/libs/parallelIce/CMakeLists.txt | 7 +++++++ src/libs/pioneer/CMakeLists.txt | 5 +++++ src/libs/progeo/CMakeLists.txt | 5 +++++ src/libs/visionlib/CMakeLists.txt | 5 +++++ src/libs/visionlib/colorspaces/CMakeLists.txt | 6 ++++++ src/libs/visionlib/cvblob/CMakeLists.txt | 6 ++++++ src/libs/visionlib/cvfast/CMakeLists.txt | 6 ++++++ src/libs/visionlib/imgAnalyze/CMakeLists.txt | 6 ++++++ src/libs/xmlParser/CMakeLists.txt | 6 ++++++ 18 files changed, 114 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dcde1315..303c01071 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,20 +151,6 @@ FOREACH (lib ${LIB_FILES}) ENDFOREACH(lib) -FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/libs/*.h) -FOREACH(currentSourceFile ${HEADERS_FILES}) - string(REGEX REPLACE "(.*/).*.h" "\\1" new_source1 ${currentSourceFile}) - string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/src/libs" "" new_source2 ${new_source1}) - INSTALL (FILES ${currentSourceFile} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/${new_source2} COMPONENT core) -ENDFOREACH(currentSourceFile) - -# Install libraries headers -FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/libs/*.h) -FOREACH(currentSourceFile ${HEADERS_FILES}) - string(REGEX REPLACE ".*/(.*/).*.h" "\\1" new_source1 ${currentSourceFile}) - INSTALL (FILES ${currentSourceFile} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/${new_source1} COMPONENT core) -ENDFOREACH(currentSourceFile) - # Install Executables list_subdirectories2( LIST_DRIVERS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/ 1) list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1) diff --git a/src/libs/depthLib/CMakeLists.txt b/src/libs/depthLib/CMakeLists.txt index e7f1ff8b5..463539e04 100644 --- a/src/libs/depthLib/CMakeLists.txt +++ b/src/libs/depthLib/CMakeLists.txt @@ -19,3 +19,9 @@ install(TARGETS depthLib depthLibshare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/depthLib/ + COMPONENT core +) diff --git a/src/libs/fuzzylib/CMakeLists.txt b/src/libs/fuzzylib/CMakeLists.txt index 02c0cdc60..d1e5e271a 100644 --- a/src/libs/fuzzylib/CMakeLists.txt +++ b/src/libs/fuzzylib/CMakeLists.txt @@ -11,3 +11,8 @@ install(TARGETS fuzzylib fuzzyshare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +install( FILES fuzzylib.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/fuzzylib/ + COMPONENT core +) diff --git a/src/libs/geometry/CMakeLists.txt b/src/libs/geometry/CMakeLists.txt index bfc6bad59..688ea9e2b 100644 --- a/src/libs/geometry/CMakeLists.txt +++ b/src/libs/geometry/CMakeLists.txt @@ -25,3 +25,21 @@ install(TARGETS geometry DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + + + +FILE(GLOB_RECURSE GEOMETRY_HEADERS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h) + +FOREACH(currentSourceFile ${GEOMETRY_HEADERS_FILES}) +string(REGEX REPLACE "(.*/).*.h" "\\1" new_source1 ${currentSourceFile}) + install( FILES ${currentSourceFile} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/geometry/${new_source1} + COMPONENT core + ) +ENDFOREACH(currentSourceFile) + +install( FILES Dense.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/geometry/ + COMPONENT core +) + diff --git a/src/libs/jderobotHandlers/CMakeLists.txt b/src/libs/jderobotHandlers/CMakeLists.txt index 41f56d01f..cff0a3fb8 100644 --- a/src/libs/jderobotHandlers/CMakeLists.txt +++ b/src/libs/jderobotHandlers/CMakeLists.txt @@ -21,3 +21,16 @@ install(TARGETS jderobotHandlers jderobotHandlersshare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HANDLERS_HEADERS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) + +install( FILES common/CommonHandler.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/jderobotHandlers/common/ + COMPONENT core +) + +install( FILES ReplayControlerClientHDL.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/jderobotHandlers/ + COMPONENT core +) + diff --git a/src/libs/jderobotViewer/CMakeLists.txt b/src/libs/jderobotViewer/CMakeLists.txt index caa2657db..c299a2e5f 100644 --- a/src/libs/jderobotViewer/CMakeLists.txt +++ b/src/libs/jderobotViewer/CMakeLists.txt @@ -20,5 +20,10 @@ if (with_pcl) install(TARGETS jderobotViewer jderobotViewerShare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core + ) + + install( FILES JderobotViewer.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/jderobotViewer/ + COMPONENT core ) endif() diff --git a/src/libs/jderobotutil/CMakeLists.txt b/src/libs/jderobotutil/CMakeLists.txt index 37d2b8af0..6bbbf23f7 100644 --- a/src/libs/jderobotutil/CMakeLists.txt +++ b/src/libs/jderobotutil/CMakeLists.txt @@ -25,3 +25,9 @@ install(TARGETS jderobotutil jderobotutilshare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/jderobotutil/ + COMPONENT core +) diff --git a/src/libs/logger/CMakeLists.txt b/src/libs/logger/CMakeLists.txt index daa2fcd6f..bc0cb0b88 100644 --- a/src/libs/logger/CMakeLists.txt +++ b/src/libs/logger/CMakeLists.txt @@ -29,4 +29,8 @@ install(TARGETS logger DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) +install( FILES Logger.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/logger/ + COMPONENT core +) diff --git a/src/libs/ns/CMakeLists.txt b/src/libs/ns/CMakeLists.txt index a84292aa3..94694a22a 100644 --- a/src/libs/ns/CMakeLists.txt +++ b/src/libs/ns/CMakeLists.txt @@ -22,3 +22,8 @@ install(TARGETS ns DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +install( FILES ns.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/ns/ + COMPONENT core +) diff --git a/src/libs/parallelIce/CMakeLists.txt b/src/libs/parallelIce/CMakeLists.txt index 3dccccf51..eaa74f19b 100644 --- a/src/libs/parallelIce/CMakeLists.txt +++ b/src/libs/parallelIce/CMakeLists.txt @@ -19,3 +19,10 @@ install(TARGETS parallelIce parallelIceshare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/parallelIce/ + COMPONENT core +) diff --git a/src/libs/pioneer/CMakeLists.txt b/src/libs/pioneer/CMakeLists.txt index bbade15a6..2a8b84d3c 100644 --- a/src/libs/pioneer/CMakeLists.txt +++ b/src/libs/pioneer/CMakeLists.txt @@ -9,3 +9,8 @@ install(TARGETS pioneer pioneershare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +install( FILES pioneer.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/pioneer/ + COMPONENT core +) diff --git a/src/libs/progeo/CMakeLists.txt b/src/libs/progeo/CMakeLists.txt index 6adb0bda1..b0de7745a 100644 --- a/src/libs/progeo/CMakeLists.txt +++ b/src/libs/progeo/CMakeLists.txt @@ -12,3 +12,8 @@ install(TARGETS progeo DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +install( FILES progeo.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/progeo/ + COMPONENT core +) diff --git a/src/libs/visionlib/CMakeLists.txt b/src/libs/visionlib/CMakeLists.txt index c76c8667f..9944a5569 100644 --- a/src/libs/visionlib/CMakeLists.txt +++ b/src/libs/visionlib/CMakeLists.txt @@ -5,3 +5,8 @@ FOREACH (libs ${LIST_LIBS}) ADD_SUBDIRECTORY (${libs}) ENDFOREACH() +install( FILES visionlib.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/visionlib/ + COMPONENT core +) + diff --git a/src/libs/visionlib/colorspaces/CMakeLists.txt b/src/libs/visionlib/colorspaces/CMakeLists.txt index 4a4bb37bb..dbf955aa9 100644 --- a/src/libs/visionlib/colorspaces/CMakeLists.txt +++ b/src/libs/visionlib/colorspaces/CMakeLists.txt @@ -18,3 +18,9 @@ install(TARGETS colorspaces colorspacesmm DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/visionlib/colorspaces + COMPONENT core +) diff --git a/src/libs/visionlib/cvblob/CMakeLists.txt b/src/libs/visionlib/cvblob/CMakeLists.txt index 3066582f0..2e668955f 100644 --- a/src/libs/visionlib/cvblob/CMakeLists.txt +++ b/src/libs/visionlib/cvblob/CMakeLists.txt @@ -42,3 +42,9 @@ install(TARGETS cvblob DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/visionlib/cvblob + COMPONENT core +) diff --git a/src/libs/visionlib/cvfast/CMakeLists.txt b/src/libs/visionlib/cvfast/CMakeLists.txt index 2daf80da8..b50045675 100644 --- a/src/libs/visionlib/cvfast/CMakeLists.txt +++ b/src/libs/visionlib/cvfast/CMakeLists.txt @@ -8,3 +8,9 @@ install(TARGETS cvfast DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/visionlib/cvfast + COMPONENT core +) diff --git a/src/libs/visionlib/imgAnalyze/CMakeLists.txt b/src/libs/visionlib/imgAnalyze/CMakeLists.txt index 084382959..f58cd5cb5 100644 --- a/src/libs/visionlib/imgAnalyze/CMakeLists.txt +++ b/src/libs/visionlib/imgAnalyze/CMakeLists.txt @@ -8,3 +8,9 @@ install(TARGETS imgAnalyze DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/visionlib/imgAnalyze + COMPONENT core +) diff --git a/src/libs/xmlParser/CMakeLists.txt b/src/libs/xmlParser/CMakeLists.txt index 177f9926f..c5eb9fcf8 100644 --- a/src/libs/xmlParser/CMakeLists.txt +++ b/src/libs/xmlParser/CMakeLists.txt @@ -18,3 +18,9 @@ install(TARGETS xmlParser xmlParsershare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) + +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +install( FILES ${HEADERS_FILES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jderobot/xmlParser + COMPONENT core +) From c92342110f8e17cebb2179c349fc3a2d0938ef1d Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Thu, 20 Apr 2017 08:21:12 +0000 Subject: [PATCH 6/7] [issue #753] Deleted lib installs of main CMakeLists --- CMakeLists.txt | 12 ------------ src/libs/easyiceconfig/CMakeLists.txt | 2 +- src/libs/jderobotcomm_cpp/CMakeLists.txt | 2 +- src/libs/progeo/CMakeLists.txt | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 303c01071..071e48056 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,18 +139,6 @@ add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/src) ################### -# install all libraries -FILE(GLOB LIB_FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libs/*/*.so*) -FOREACH (lib ${LIB_FILES}) - INSTALL (FILES ${lib} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core) -ENDFOREACH(lib) - -FILE(GLOB LIB_FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libs/visionlib/*/*.so*) -FOREACH (lib ${LIB_FILES}) - INSTALL (FILES ${lib} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core) -ENDFOREACH(lib) - - # Install Executables list_subdirectories2( LIST_DRIVERS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/ 1) list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1) diff --git a/src/libs/easyiceconfig/CMakeLists.txt b/src/libs/easyiceconfig/CMakeLists.txt index 095541728..baaef9180 100644 --- a/src/libs/easyiceconfig/CMakeLists.txt +++ b/src/libs/easyiceconfig/CMakeLists.txt @@ -70,7 +70,7 @@ target_link_libraries(test_loader ${PROJECT_NAME} ${Ice_LIBRARIES}) ### Install -install(TARGETS ${PROJECT_NAME} +install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}-embedded DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) diff --git a/src/libs/jderobotcomm_cpp/CMakeLists.txt b/src/libs/jderobotcomm_cpp/CMakeLists.txt index 23ced9cf6..c7cf0d1e0 100644 --- a/src/libs/jderobotcomm_cpp/CMakeLists.txt +++ b/src/libs/jderobotcomm_cpp/CMakeLists.txt @@ -103,7 +103,7 @@ set(${PROJECT_NAME}_LIBRARIES "${PROJECT_NAME}" CACHE STRINGS "Find(${PROJECT_NA ### Install -install(TARGETS ${PROJECT_NAME} +install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}-embedded DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) diff --git a/src/libs/progeo/CMakeLists.txt b/src/libs/progeo/CMakeLists.txt index b0de7745a..aee911bb9 100644 --- a/src/libs/progeo/CMakeLists.txt +++ b/src/libs/progeo/CMakeLists.txt @@ -8,7 +8,7 @@ TARGET_LINK_LIBRARIES(progeoshare ${gsl_LIBRARIES} ${xerces_LIBRARIES} ${LIBXML2 TARGET_LINK_LIBRARIES(progeo ${gsl_LIBRARIES} ${xerces_LIBRARIES} ${LIBXML2_LIBRARIES}) ### Install -install(TARGETS progeo +install(TARGETS progeo progeoshare DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot COMPONENT core ) From 4276d58a039bac586bdf7ab506d343b14791e00c Mon Sep 17 00:00:00 2001 From: Aitor Martinez Date: Thu, 20 Apr 2017 08:49:12 +0000 Subject: [PATCH 7/7] [issue #753] Deleted bin installations of Main CMakeLists --- CMakeLists.txt | 17 ----------------- src/drivers/ardrone_server/CMakeLists.txt | 9 ++++++++- src/drivers/basic_server/CMakeLists.txt | 7 +++++++ src/drivers/cameraserver/CMakeLists.txt | 6 ++++++ src/drivers/emSensorDriver/CMakeLists.txt | 5 +++++ src/drivers/giraffeServer/CMakeLists.txt | 5 +++++ src/drivers/kinect2server/CMakeLists.txt | 6 ++++++ src/drivers/kobuki_driver/CMakeLists.txt | 6 ++++++ src/drivers/laser_server/CMakeLists.txt | 6 ++++++ src/drivers/openni1Server/CMakeLists.txt | 6 ++++++ src/drivers/openniServer/CMakeLists.txt | 5 +++++ src/drivers/pclRGBDServer/CMakeLists.txt | 6 ++++++ src/tools/3DViewer/CMakeLists.txt | 9 ++++++++- src/tools/basic_component/CMakeLists.txt | 8 +++++++- src/tools/cameraCalibrator/CMakeLists.txt | 6 ++++++ src/tools/cameraview/CMakeLists.txt | 4 ++++ src/tools/giraffeClient/CMakeLists.txt | 4 ++++ src/tools/kobukiViewer/CMakeLists.txt | 8 +++++++- src/tools/namingService/CMakeLists.txt | 5 +++++ src/tools/naoviewer/CMakeLists.txt | 11 ++++++++--- src/tools/navigatorCamera/CMakeLists.txt | 5 +++++ src/tools/opencvdemo/CMakeLists.txt | 5 ++++- src/tools/recorder2/CMakeLists.txt | 5 ++++- src/tools/replayController/CMakeLists.txt | 5 +++++ src/tools/replayer2/CMakeLists.txt | 6 +++++- src/tools/rgbdCalibrator/CMakeLists.txt | 4 ++++ src/tools/rgbdManualCalibrator/CMakeLists.txt | 5 +++++ src/tools/rgbdViewer/CMakeLists.txt | 4 ++++ src/tools/uav_viewer/CMakeLists.txt | 11 +++++++++-- src/tools/visualHFSM/CMakeLists.txt | 15 ++++++++++++--- 30 files changed, 172 insertions(+), 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 071e48056..a42ede6d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,23 +143,6 @@ add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/src) list_subdirectories2( LIST_DRIVERS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/ 1) list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1) -FOREACH (currentBin ${LIST_DRIVERS}) - if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/${currentBin}/${currentBin}) - INSTALL (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core) - else() - INSTALL (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/drivers/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core) - endif() -ENDFOREACH(currentBin) - -FOREACH (currentBin ${LIST_TOOLS}) - if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/${currentBin}/${currentBin}) - INSTALL (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core) - else() - INSTALL (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/tools/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core) - endif() -ENDFOREACH(currentBin) - - # Install Deps cmake's tree INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot) diff --git a/src/drivers/ardrone_server/CMakeLists.txt b/src/drivers/ardrone_server/CMakeLists.txt index 76c219c7f..c90d2e8b0 100644 --- a/src/drivers/ardrone_server/CMakeLists.txt +++ b/src/drivers/ardrone_server/CMakeLists.txt @@ -89,10 +89,17 @@ if(ARDRONE_ALL_DEPS) ${easyiceconfig_LIBRARIES}) + + install(TARGETS ardrone_server ardrone_print_gps_data + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ardrone_interfaces.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) INSTALL(DIRECTORY config DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ELSE() message(WARNING "ardrone_server marked to build, but required dependencies were not met. You should install third party library: ardonelib") ENDIF() -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ardrone_interfaces.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + diff --git a/src/drivers/basic_server/CMakeLists.txt b/src/drivers/basic_server/CMakeLists.txt index ceb00c047..d3ceab15f 100644 --- a/src/drivers/basic_server/CMakeLists.txt +++ b/src/drivers/basic_server/CMakeLists.txt @@ -27,4 +27,11 @@ TARGET_LINK_LIBRARIES(basic_server ${ZeroCIce_LIBRARIES} ${easyiceconfig_LIBRARIES} ) + + +install(TARGETS basic_server + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/drivers/cameraserver/CMakeLists.txt b/src/drivers/cameraserver/CMakeLists.txt index 2b1e06e94..8be69daec 100644 --- a/src/drivers/cameraserver/CMakeLists.txt +++ b/src/drivers/cameraserver/CMakeLists.txt @@ -31,4 +31,10 @@ TARGET_LINK_LIBRARIES(cameraserver ns ${GLOG_LIBRARIES} ) + +install(TARGETS cameraserver + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraserver.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/drivers/emSensorDriver/CMakeLists.txt b/src/drivers/emSensorDriver/CMakeLists.txt index 5025b2905..0e02320c5 100644 --- a/src/drivers/emSensorDriver/CMakeLists.txt +++ b/src/drivers/emSensorDriver/CMakeLists.txt @@ -37,6 +37,11 @@ if(wiringPi_LIBRARY) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/emSensorDriver.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + install(TARGETS emSensorDriver + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + else() message("Boost thread library is required to build emSensorDriver, skipping driver build.") endif() diff --git a/src/drivers/giraffeServer/CMakeLists.txt b/src/drivers/giraffeServer/CMakeLists.txt index 28b773aa0..1bcc57cf3 100644 --- a/src/drivers/giraffeServer/CMakeLists.txt +++ b/src/drivers/giraffeServer/CMakeLists.txt @@ -23,6 +23,11 @@ TARGET_LINK_LIBRARIES(giraffeServer QtCore QtGui ) + +install(TARGETS giraffeServer + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/giraffeServer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) endif() diff --git a/src/drivers/kinect2server/CMakeLists.txt b/src/drivers/kinect2server/CMakeLists.txt index ebc6cc743..7aa184ce8 100644 --- a/src/drivers/kinect2server/CMakeLists.txt +++ b/src/drivers/kinect2server/CMakeLists.txt @@ -40,6 +40,12 @@ link_directories( ${ZLIB_LIBRARIES} ${freenect2_LIBRARIES} ) + + install(TARGETS kinect2Server + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kinect2server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ELSE() message("Disabled") diff --git a/src/drivers/kobuki_driver/CMakeLists.txt b/src/drivers/kobuki_driver/CMakeLists.txt index bd1dc7c58..3da2d7429 100644 --- a/src/drivers/kobuki_driver/CMakeLists.txt +++ b/src/drivers/kobuki_driver/CMakeLists.txt @@ -27,6 +27,12 @@ if (${kobuki_COMPILE}) ${ZeroCIce_LIBRARIES} ${easyiceconfig_LIBRARIES} ) + + install(TARGETS kobuki_driver + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kobuki_driver.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ENDIF() diff --git a/src/drivers/laser_server/CMakeLists.txt b/src/drivers/laser_server/CMakeLists.txt index f0fc14a1a..13b502471 100644 --- a/src/drivers/laser_server/CMakeLists.txt +++ b/src/drivers/laser_server/CMakeLists.txt @@ -24,4 +24,10 @@ TARGET_LINK_LIBRARIES(${NAME} JderobotInterfaces ${easyiceconfig_LIBRARIES} ) + +install(TARGETS ${NAME} + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/laser_server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/drivers/openni1Server/CMakeLists.txt b/src/drivers/openni1Server/CMakeLists.txt index 719f75cfd..f0bbf32ef 100644 --- a/src/drivers/openni1Server/CMakeLists.txt +++ b/src/drivers/openni1Server/CMakeLists.txt @@ -64,6 +64,12 @@ IF(openni_LIBRARIES AND LIBUSB_INCLUDE_DIRS) progeo ) ENDIF() + + install(TARGETS openni1Server + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/openni1Server.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ENDIF() diff --git a/src/drivers/openniServer/CMakeLists.txt b/src/drivers/openniServer/CMakeLists.txt index efe8b6219..c69710416 100644 --- a/src/drivers/openniServer/CMakeLists.txt +++ b/src/drivers/openniServer/CMakeLists.txt @@ -90,6 +90,11 @@ IF(OPENNI2_LIB) ) endif() + install(TARGETS openniServer + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + FILE(GLOB_RECURSE CFG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cfg) INSTALL (FILES ${CFG_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT core) ENDIF() diff --git a/src/drivers/pclRGBDServer/CMakeLists.txt b/src/drivers/pclRGBDServer/CMakeLists.txt index 01e964348..295c3769f 100644 --- a/src/drivers/pclRGBDServer/CMakeLists.txt +++ b/src/drivers/pclRGBDServer/CMakeLists.txt @@ -31,6 +31,12 @@ if(pcl_openni) ${Boost_LIBRARIES} ${easyiceconfig_LIBRARIES} ) + + install(TARGETS pclRGBDServer + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT drivers + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kinectServer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) endif() diff --git a/src/tools/3DViewer/CMakeLists.txt b/src/tools/3DViewer/CMakeLists.txt index b5d188981..8721d26b7 100644 --- a/src/tools/3DViewer/CMakeLists.txt +++ b/src/tools/3DViewer/CMakeLists.txt @@ -34,9 +34,16 @@ IF (with_pcl) ${CMAKE_THREAD_LIBS_INIT} ${GLOG_LIBRARIES} ) + + install(TARGETS 3DViewer + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/3DViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ENDIF() -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/3DViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + diff --git a/src/tools/basic_component/CMakeLists.txt b/src/tools/basic_component/CMakeLists.txt index 81335b041..a0863431b 100644 --- a/src/tools/basic_component/CMakeLists.txt +++ b/src/tools/basic_component/CMakeLists.txt @@ -75,8 +75,14 @@ if (${QT5_COMPILE}) ${resourcelocator_LIBRARIES} ${GLOG_LIBRARIES} ) + + install(TARGETS basic_component + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_component.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ENDIF() -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/basic_component.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + diff --git a/src/tools/cameraCalibrator/CMakeLists.txt b/src/tools/cameraCalibrator/CMakeLists.txt index fd5d693dd..dab36b80d 100644 --- a/src/tools/cameraCalibrator/CMakeLists.txt +++ b/src/tools/cameraCalibrator/CMakeLists.txt @@ -32,4 +32,10 @@ add_executable (cameraCalibrator ${SOURCE_FILES}) ${CMAKE_THREAD_LIBS_INIT} ${GLOG_LIBRARIES} ) + +install(TARGETS cameraCalibrator + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraCalibrator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/cameraview/CMakeLists.txt b/src/tools/cameraview/CMakeLists.txt index ed1c29f9e..f71ba92e0 100644 --- a/src/tools/cameraview/CMakeLists.txt +++ b/src/tools/cameraview/CMakeLists.txt @@ -42,6 +42,10 @@ TARGET_LINK_LIBRARIES(cameraview ) +install(TARGETS cameraview + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/giraffeClient/CMakeLists.txt b/src/tools/giraffeClient/CMakeLists.txt index 284a84dc9..09240186e 100644 --- a/src/tools/giraffeClient/CMakeLists.txt +++ b/src/tools/giraffeClient/CMakeLists.txt @@ -37,6 +37,10 @@ TARGET_LINK_LIBRARIES(giraffeClient ${GLOG_LIBRARIES} ) +install(TARGETS giraffeClient + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/giraffeClient.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) diff --git a/src/tools/kobukiViewer/CMakeLists.txt b/src/tools/kobukiViewer/CMakeLists.txt index b1e0a6330..2305aec97 100644 --- a/src/tools/kobukiViewer/CMakeLists.txt +++ b/src/tools/kobukiViewer/CMakeLists.txt @@ -65,6 +65,12 @@ if (${QT5_COMPILE} AND ${roscpp_FOUND}) ${GLOG_LIBRARIES} ) + install(TARGETS kobukiViewer + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kobukiViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) ENDIF() -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kobukiViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + diff --git a/src/tools/namingService/CMakeLists.txt b/src/tools/namingService/CMakeLists.txt index 69a67bd3c..b2138babe 100644 --- a/src/tools/namingService/CMakeLists.txt +++ b/src/tools/namingService/CMakeLists.txt @@ -27,4 +27,9 @@ TARGET_LINK_LIBRARIES(namingService ${GLOG_LIBRARIES} ) +install(TARGETS namingService + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/namingService.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/naoviewer/CMakeLists.txt b/src/tools/naoviewer/CMakeLists.txt index 6f51bb0ad..ff09cb1a3 100644 --- a/src/tools/naoviewer/CMakeLists.txt +++ b/src/tools/naoviewer/CMakeLists.txt @@ -31,9 +31,14 @@ TARGET_LINK_LIBRARIES ( naooperator ${GLOG_LIBRARIES} ) -ENDIF() - - + install(TARGETS naooperator + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/main_gui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/naooperator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + +ENDIF() + + diff --git a/src/tools/navigatorCamera/CMakeLists.txt b/src/tools/navigatorCamera/CMakeLists.txt index f88c37a61..0fbc684ba 100644 --- a/src/tools/navigatorCamera/CMakeLists.txt +++ b/src/tools/navigatorCamera/CMakeLists.txt @@ -42,6 +42,11 @@ TARGET_LINK_LIBRARIES(navigatorCamera ${GLOG_LIBRARIES} ) +install(TARGETS navigatorCamera + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/myimage.png DESTINATION /usr/local/share/jderobot/glade/ ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/navigatorCamera.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/navigatorCamera.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/opencvdemo/CMakeLists.txt b/src/tools/opencvdemo/CMakeLists.txt index 4b0ea0108..30eb42a7a 100644 --- a/src/tools/opencvdemo/CMakeLists.txt +++ b/src/tools/opencvdemo/CMakeLists.txt @@ -36,7 +36,10 @@ TARGET_LINK_LIBRARIES(opencvdemo ) - +install(TARGETS opencvdemo + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/opencvdemo.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/recorder2/CMakeLists.txt b/src/tools/recorder2/CMakeLists.txt index d3c5cf303..d028e8f6b 100644 --- a/src/tools/recorder2/CMakeLists.txt +++ b/src/tools/recorder2/CMakeLists.txt @@ -57,7 +57,10 @@ TARGET_LINK_LIBRARIES(recorder2 ${GLOG_LIBRARIES} ) - +install(TARGETS recorder2 + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/recordergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/recorder.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/replayController/CMakeLists.txt b/src/tools/replayController/CMakeLists.txt index 93c361174..22e8f96cc 100644 --- a/src/tools/replayController/CMakeLists.txt +++ b/src/tools/replayController/CMakeLists.txt @@ -45,5 +45,10 @@ TARGET_LINK_LIBRARIES(replayController ) +install(TARGETS replayController + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayControllerGui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayController.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/replayer2/CMakeLists.txt b/src/tools/replayer2/CMakeLists.txt index d4bfcceb2..0b9363183 100644 --- a/src/tools/replayer2/CMakeLists.txt +++ b/src/tools/replayer2/CMakeLists.txt @@ -43,6 +43,10 @@ TARGET_LINK_LIBRARIES(replayer2 ) - +install(TARGETS replayer2 + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/replayer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/rgbdCalibrator/CMakeLists.txt b/src/tools/rgbdCalibrator/CMakeLists.txt index f8b61c3a3..56030e4ba 100644 --- a/src/tools/rgbdCalibrator/CMakeLists.txt +++ b/src/tools/rgbdCalibrator/CMakeLists.txt @@ -42,6 +42,10 @@ TARGET_LINK_LIBRARIES(rgbdCalibrator ) +install(TARGETS rgbdCalibrator + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdCalibrator.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdCalibrator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/rgbdManualCalibrator/CMakeLists.txt b/src/tools/rgbdManualCalibrator/CMakeLists.txt index cccd08a72..95608a018 100644 --- a/src/tools/rgbdManualCalibrator/CMakeLists.txt +++ b/src/tools/rgbdManualCalibrator/CMakeLists.txt @@ -47,6 +47,11 @@ ${resourcelocator_LIBRARIES} ) +install(TARGETS rgbdManualCalibrator + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdManualCalibrator.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdManualCalibrator.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cam1-mia.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/rgbdViewer/CMakeLists.txt b/src/tools/rgbdViewer/CMakeLists.txt index 7700043ae..bcab1d5e9 100644 --- a/src/tools/rgbdViewer/CMakeLists.txt +++ b/src/tools/rgbdViewer/CMakeLists.txt @@ -44,6 +44,10 @@ TARGET_LINK_LIBRARIES(rgbdViewer ) +install(TARGETS rgbdViewer + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) diff --git a/src/tools/uav_viewer/CMakeLists.txt b/src/tools/uav_viewer/CMakeLists.txt index ab547c0d5..c84344c59 100644 --- a/src/tools/uav_viewer/CMakeLists.txt +++ b/src/tools/uav_viewer/CMakeLists.txt @@ -63,6 +63,13 @@ IF(QT5_COMPILE) ) + install(TARGETS uav_viewer + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/uav_viewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/uav_viewer_simulated.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + ENDIF() -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/uav_viewer.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/uav_viewer_simulated.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf) + diff --git a/src/tools/visualHFSM/CMakeLists.txt b/src/tools/visualHFSM/CMakeLists.txt index b13d955b2..0b7d988c3 100644 --- a/src/tools/visualHFSM/CMakeLists.txt +++ b/src/tools/visualHFSM/CMakeLists.txt @@ -60,11 +60,20 @@ add_custom_command(TARGET visualHFSM POST_BUILD add_custom_command(TARGET visualHFSM POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/getinterfaces.sh $) + + + install(TARGETS visualHFSM + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ + COMPONENT tools + ) + + # Install Glade + FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.glade) + + INSTALL (FILES ${GLADE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade) + ENDIF() -# Install Glade -FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.glade) -INSTALL (FILES ${GLADE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade)