Place YARP-related lines in root CMakeLines.txt

roboticslab-uc3m/questions-and-answers#54
roboticslab-uc3m · Jun 18, 2018 · 2d05bde · 2d05bde
1 parent 83a5efe
commit 2d05bde
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # Find project's hard dependencies.
 find_package(YCM 0.8 REQUIRED)
+find_package(YARP REQUIRED)
 
 # Retrieve current ASIBOT_HMI version.
 include(ASIBOT_HMIVersion)

diff --git a/cmake/ASIBOT_HMISystem.cmake b/cmake/ASIBOT_HMISystem.cmake
@@ -17,3 +17,6 @@ endif()
 
 # Install system runtime libraries.
 include(InstallRequiredSystemLibraries)
+
+# Configure installation paths for YARP resources.
+yarp_configure_external_installation(asibot WITH_PLUGINS)
diff --git a/programs/webInterface/CMakeLists.txt b/programs/webInterface/CMakeLists.txt
@@ -2,9 +2,6 @@
 # Authors: Robotics Lab UC3M
 # CopyPolicy: Released under the terms of the LGPLv2.1 or later
 
-# Find YARP.
-find_package(YARP REQUIRED)
-
 # Find ROBOTICSLAB_KINEMATICS_DYNAMICS.
 find_package(ROBOTICSLAB_KINEMATICS_DYNAMICS REQUIRED)
 

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
@@ -2,11 +2,5 @@
 # Authors: Robotics Lab UC3M
 # CopyPolicy: Released under the terms of the LGPLv2.1 or later
 
-find_package(YARP REQUIRED)
-list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
-include(YarpInstallationHelpers)
-yarp_configure_external_installation(asibot)
-
 ### Go through single applications
-
 add_subdirectory(webInterface)