Place YARP-related lines in root CMakeLists.txt

roboticslab-uc3m/questions-and-answers#54
asrob-uc3m · Nov 8, 2018 · ca75d12 · ca75d12
1 parent 8f0c76b
commit ca75d12
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,13 +6,26 @@ cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
 
 project(ROBOT_DEVASTATION_ROBOTS NONE)
 
+# Define custom options.
 option(INSTALL_SERVICES "Choose if you want to install Robot Devastation services" ON)
 
-# add main contents
+# 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(YarpInstallationHelpers)
+endif()
+
+# Configure installation paths for YARP resources.
+yarp_configure_external_installation(robotDevastation-robots)
+
+# Add main contents.
 add_subdirectory(share)
 add_subdirectory(scripts)
 
-# uninstall target
+# Configure uninstall target.
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/template/ROBOT_DEVASTATION_ROBOTSConfigUninstall.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/ROBOT_DEVASTATION_ROBOTSConfigUninstall.cmake" IMMEDIATE @ONLY)

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
@@ -2,11 +2,5 @@
 # Author: ASROB
 # 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(robotDevastation-robots)
-
 ### Go through single applications
-
 add_subdirectory(launch)