From 1de27a1ca0d3f7c45840b8b549680d714a8e59e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Fri, 13 Apr 2018 13:18:05 +0200 Subject: [PATCH] Place YARP-related lines in root CMakeLists.txt https://github.com/roboticslab-uc3m/questions-and-answers/issues/54 --- CMakeLists.txt | 15 ++++++++++++++- libraries/YarpPlugins/CMakeLists.txt | 5 ----- programs/colorRegionDetection/CMakeLists.txt | 7 ++++--- programs/colorRegionDetection2D/CMakeLists.txt | 7 ++++--- programs/haarDetection/CMakeLists.txt | 7 ++++--- programs/haarDetection2D/CMakeLists.txt | 7 ++++--- programs/kinectPxToReal/CMakeLists.txt | 6 +++--- programs/pointAtObjectServer/CMakeLists.txt | 9 +++++---- programs/voxelOccupancyDetection/CMakeLists.txt | 6 +++--- share/CMakeLists.txt | 5 ----- 10 files changed, 41 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7d45be9..01cc0260 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,10 +94,23 @@ set_property(GLOBAL PROPERTY ROBOTICSLAB_VISION_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-vision) + # Add main contents. -add_subdirectory(share) add_subdirectory(libraries) add_subdirectory(programs) +add_subdirectory(share) # Store the package in the user registry. export(PACKAGE ROBOTICSLAB_VISION) diff --git a/libraries/YarpPlugins/CMakeLists.txt b/libraries/YarpPlugins/CMakeLists.txt index 4322d507..14111ad9 100644 --- a/libraries/YarpPlugins/CMakeLists.txt +++ b/libraries/YarpPlugins/CMakeLists.txt @@ -6,12 +6,7 @@ option(ENABLE_YarpPlugins "Enable/disable YarpPlugins" OFF) if(ENABLE_YarpPlugins) -# Find YARP (common dependency for all devices). -find_package(YARP REQUIRED) - if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) - list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH}) - include(YarpPlugin) include_directories(${YARP_INCLUDE_DIRS}) endif() diff --git a/programs/colorRegionDetection/CMakeLists.txt b/programs/colorRegionDetection/CMakeLists.txt index a265619a..4ebbb571 100644 --- a/programs/colorRegionDetection/CMakeLists.txt +++ b/programs/colorRegionDetection/CMakeLists.txt @@ -9,10 +9,11 @@ cmake_dependent_option(ENABLE_colorRegionDetection "Enable/disable colorRegionDe if(ENABLE_colorRegionDetection) - find_package(YARP REQUIRED) + include_directories(${OpenCV_INCLUDE_DIRS}) - include_directories(${YARP_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS}) + if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) + include_directories(${YARP_INCLUDE_DIRS}) + endif() add_executable(colorRegionDetection main.cpp ColorRegionDetection.hpp diff --git a/programs/colorRegionDetection2D/CMakeLists.txt b/programs/colorRegionDetection2D/CMakeLists.txt index 7f3bb2d7..37cd26dd 100644 --- a/programs/colorRegionDetection2D/CMakeLists.txt +++ b/programs/colorRegionDetection2D/CMakeLists.txt @@ -9,10 +9,11 @@ cmake_dependent_option(ENABLE_colorRegionDetection2D "Enable/disable colorRegion if(ENABLE_colorRegionDetection2D) - find_package(YARP REQUIRED) + include_directories(${OpenCV_INCLUDE_DIRS}) - include_directories(${YARP_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS}) + if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) + include_directories(${YARP_INCLUDE_DIRS}) + endif() add_executable(colorRegionDetection2D main.cpp SegmentorThread.cpp diff --git a/programs/haarDetection/CMakeLists.txt b/programs/haarDetection/CMakeLists.txt index 6daefcac..2aba6474 100644 --- a/programs/haarDetection/CMakeLists.txt +++ b/programs/haarDetection/CMakeLists.txt @@ -9,10 +9,11 @@ cmake_dependent_option(ENABLE_haarDetection "Enable/disable haarDetection progra if(ENABLE_haarDetection) - find_package(YARP REQUIRED) + include_directories(${OpenCV_INCLUDE_DIRS}) - include_directories(${YARP_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS}) + if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) + include_directories(${YARP_INCLUDE_DIRS}) + endif() add_executable(haarDetection main.cpp HaarDetection.hpp diff --git a/programs/haarDetection2D/CMakeLists.txt b/programs/haarDetection2D/CMakeLists.txt index a1e85a03..f7ce68b4 100644 --- a/programs/haarDetection2D/CMakeLists.txt +++ b/programs/haarDetection2D/CMakeLists.txt @@ -9,10 +9,11 @@ cmake_dependent_option(ENABLE_haarDetection2D "Enable/disable haarDetection2D pr if(ENABLE_haarDetection2D) - find_package(YARP REQUIRED) + include_directories(${OpenCV_INCLUDE_DIRS}) - include_directories(${YARP_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS}) + if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) + include_directories(${YARP_INCLUDE_DIRS}) + endif() add_executable(haarDetection2D main.cpp HaarDetection2D.hpp diff --git a/programs/kinectPxToReal/CMakeLists.txt b/programs/kinectPxToReal/CMakeLists.txt index ca711cb0..eb9e734c 100644 --- a/programs/kinectPxToReal/CMakeLists.txt +++ b/programs/kinectPxToReal/CMakeLists.txt @@ -2,9 +2,9 @@ option(ENABLE_kinectPxToReal "Enable/disable kinectPxToReal program" ON) if(ENABLE_kinectPxToReal) -find_package(YARP REQUIRED) - -include_directories(${YARP_INCLUDE_DIRS}) +if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) + include_directories(${YARP_INCLUDE_DIRS}) +endif() add_executable(kinectPxToReal main.cpp KinectPxToReal.hpp diff --git a/programs/pointAtObjectServer/CMakeLists.txt b/programs/pointAtObjectServer/CMakeLists.txt index c5ba0ce0..2313c640 100644 --- a/programs/pointAtObjectServer/CMakeLists.txt +++ b/programs/pointAtObjectServer/CMakeLists.txt @@ -9,13 +9,14 @@ cmake_dependent_option(ENABLE_pointAtObjectServer "Enable/disable pointAtObjectS if(ENABLE_pointAtObjectServer) - find_package(YARP REQUIRED) - - include_directories(${YARP_INCLUDE_DIRS} - ${PCL_INCLUDE_DIRS}) + include_directories(${PCL_INCLUDE_DIRS}) link_directories(${PCL_LIBRARY_DIRS}) + if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) + include_directories(${YARP_INCLUDE_DIRS}) + endif() + add_executable(pointAtObjectServer main.cpp PointAtObjectServer.hpp PointAtObjectServer.cpp diff --git a/programs/voxelOccupancyDetection/CMakeLists.txt b/programs/voxelOccupancyDetection/CMakeLists.txt index 631ea5e4..c7005d6d 100644 --- a/programs/voxelOccupancyDetection/CMakeLists.txt +++ b/programs/voxelOccupancyDetection/CMakeLists.txt @@ -2,9 +2,9 @@ option(ENABLE_voxelOccupancyDetection "Enable/disable voxelOccupancyDetection pr if(ENABLE_voxelOccupancyDetection) -find_package(YARP REQUIRED) - -include_directories(${YARP_INCLUDE_DIRS}) +if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) + include_directories(${YARP_INCLUDE_DIRS}) +endif() add_executable(voxelOccupancyDetection main.cpp VoxelOccupancyDetection.hpp diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index e97860ba..73887c3b 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -2,11 +2,6 @@ # Author: Juan G Victores # 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-vision) - yarp_install(FILES ymanager.ini DESTINATION ${ROBOTICSLAB-VISION_DATA_INSTALL_DIR})