Merge branch 'review-cmake' into develop

- roboticslab-uc3m/questions-and-answers#45
roboticslab-uc3m · Mar 23, 2018 · 4b4ff60 · 4b4ff60
2 parents 3af0ddf + 204edae
commit 4b4ff60
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,9 +99,26 @@ endif()
 # Store list of exported targets in global scope.
 set_property(GLOBAL PROPERTY ROBOTICSLAB_OPENRAVE_YARP_PLUGINS_TARGETS)
 
+# Create targets if specific requirements are satisfied.
+include(CMakeDependentOption)
+
+# Find YARP (main dependency).
+find_package(YARP REQUIRED)
+
+# Load YARP modules.
+if(YARP_VERSION_SHORT VERSION_LESS 2.3.70)
+    list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
+    include(YarpPlugin)
+    include(YarpInstallationHelpers)
+endif()
+
+# Configure installation paths for YARP resources.
+yarp_configure_external_installation(roboticslab-openrave-yarp-plugins WITH_PLUGINS)
+
 # Add main contents.
 add_subdirectory(cmake)
 add_subdirectory(libraries)
+#add_subdirectory(share)
 
 # Store the package in the user registry.
 export(PACKAGE ROBOTICSLAB_OPENRAVE_YARP_PLUGINS)

diff --git a/libraries/YarpPlugins/YarpOpenraveControlboard/CMakeLists.txt b/libraries/YarpPlugins/YarpOpenraveControlboard/CMakeLists.txt
@@ -48,11 +48,11 @@ target_link_libraries(YarpOpenraveControlboard YARP::YARP_OS
 
 yarp_install(TARGETS YarpOpenraveControlboard
              COMPONENT runtime
-             LIBRARY DESTINATION ${YARP_DYNAMIC_PLUGINS_INSTALL_DIR}
-             ARCHIVE DESTINATION ${YARP_STATIC_PLUGINS_INSTALL_DIR})
+             LIBRARY DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_DYNAMIC_PLUGINS_INSTALL_DIR}
+             ARCHIVE DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_STATIC_PLUGINS_INSTALL_DIR})
 
 yarp_install(FILES YarpOpenraveControlboard.ini
              COMPONENT runtime
-             DESTINATION ${YARP_PLUGIN_MANIFESTS_INSTALL_DIR})
+             DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_PLUGIN_MANIFESTS_INSTALL_DIR})
 
 endif()
diff --git a/libraries/YarpPlugins/YarpOpenraveGrabber/CMakeLists.txt b/libraries/YarpPlugins/YarpOpenraveGrabber/CMakeLists.txt
@@ -45,12 +45,12 @@ if(NOT SKIP_YarpOpenraveGrabber)
     yarp_install(TARGETS YarpOpenraveGrabber
                  EXPORT YARP
                  COMPONENT runtime
-                 LIBRARY DESTINATION ${YARP_DYNAMIC_PLUGINS_INSTALL_DIR}
-                 ARCHIVE DESTINATION ${YARP_STATIC_PLUGINS_INSTALL_DIR})
+                 LIBRARY DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_DYNAMIC_PLUGINS_INSTALL_DIR}
+                 ARCHIVE DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_STATIC_PLUGINS_INSTALL_DIR})
 
     yarp_install(FILES YarpOpenraveGrabber.ini
                  COMPONENT runtime
-                 DESTINATION ${YARP_PLUGIN_MANIFESTS_INSTALL_DIR})
+                 DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_PLUGIN_MANIFESTS_INSTALL_DIR})
 
 else()
 

diff --git a/libraries/YarpPlugins/YarpOpenraveRGBDSensor/CMakeLists.txt b/libraries/YarpPlugins/YarpOpenraveRGBDSensor/CMakeLists.txt
@@ -45,12 +45,12 @@ if(NOT SKIP_YarpOpenraveRGBDSensor)
     yarp_install(TARGETS YarpOpenraveRGBDSensor
                  EXPORT YARP
                  COMPONENT runtime
-                 LIBRARY DESTINATION ${YARP_DYNAMIC_PLUGINS_INSTALL_DIR}
-                 ARCHIVE DESTINATION ${YARP_STATIC_PLUGINS_INSTALL_DIR})
+                 LIBRARY DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_DYNAMIC_PLUGINS_INSTALL_DIR}
+                 ARCHIVE DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_STATIC_PLUGINS_INSTALL_DIR})
 
     yarp_install(FILES YarpOpenraveRGBDSensor.ini
                  COMPONENT runtime
-                 DESTINATION ${YARP_PLUGIN_MANIFESTS_INSTALL_DIR})
+                 DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_PLUGIN_MANIFESTS_INSTALL_DIR})
 
 else()
 

diff --git a/libraries/YarpPlugins/YarpOpenraveRobotManager/CMakeLists.txt b/libraries/YarpPlugins/YarpOpenraveRobotManager/CMakeLists.txt
@@ -41,11 +41,11 @@ target_link_libraries(YarpOpenraveRobotManager YARP::YARP_OS
 yarp_install(TARGETS YarpOpenraveRobotManager
              EXPORT YARP
              COMPONENT runtime
-             LIBRARY DESTINATION ${YARP_DYNAMIC_PLUGINS_INSTALL_DIR}
-             ARCHIVE DESTINATION ${YARP_STATIC_PLUGINS_INSTALL_DIR})
+             LIBRARY DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_DYNAMIC_PLUGINS_INSTALL_DIR}
+             ARCHIVE DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_STATIC_PLUGINS_INSTALL_DIR})
 
 yarp_install(FILES YarpOpenraveRobotManager.ini
              COMPONENT runtime
-             DESTINATION ${YARP_PLUGIN_MANIFESTS_INSTALL_DIR})
+             DESTINATION ${ROBOTICSLAB-OPENRAVE-YARP-PLUGINS_PLUGIN_MANIFESTS_INSTALL_DIR})
 
 endif()
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
@@ -2,11 +2,6 @@
 # Author: Juan G. Victores and Raul Fernandez-Fernandez
 # CopyPolicy: Released under the terms of the GNU GPL v2.0.
 
-find_package(YARP REQUIRED)
-list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
-include(YarpInstallationHelpers)
-yarp_configure_external_installation(roboticslab-openrave-yarp-plugins)
-
 ### Go through single applications
 
 #add_subdirectory(example)