Require YCM and newer YARP, bump to CMake 3.5

* roboticslab-uc3m/questions-and-answers#55 * roboticslab-uc3m/questions-and-answers#65
roboticslab-uc3m · Jun 18, 2018 · c1c5234 · c1c5234
1 parent 20d5aed
commit c1c5234
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 136 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,42 +1,40 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 # Define a project.
-project(AMOR_OPENRAVE_MODELS)
+project(AMOR_OPENRAVE_MODELS LANGUAGES NONE)
 
-# Load custom CMake modules.
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+# Find dependencies
+find_package(YCM 0.8 REQUIRED)
 
-# Find YARP and load configuration, fail otherwise.
-find_package(YARP REQUIRED)
-
-# Make YARP's modules visible to current CMake file.
-list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
-
-# Load yarp_configure_external_installation() and yarp_install().
-include(YarpInstallationHelpers)
+# https://github.com/roboticslab-uc3m/questions-and-answers/issues/65
+find_package(YARP 3.0 QUIET)
+if(NOT YARP_FOUND)
+    find_package(YARP 2.3.70 REQUIRED)
+endif()
 
 # Set some useful variables - paths relative to the installation prefix.
 yarp_configure_external_installation(amor)
 
-set(models_dir openrave)
-
 # Configure install rule, copy models to the build directory.
-yarp_install(DIRECTORY openrave DESTINATION ${AMOR_CONTEXTS_INSTALL_DIR})
+yarp_install(DIRECTORY openrave
+             DESTINATION ${AMOR_CONTEXTS_INSTALL_DIR})
 
 # Store this package in the user registry.
 export(PACKAGE AMOR_OPENRAVE_MODELS)
 
 # Define CMAKE_INSTALL_<dir> and CMAKE_INSTALL_FULL_<dir> variables.
 include(GNUInstallDirs)
 
+# Set installation path for CMake files.
 if(WIN32)
     set(AMOR_OPENRAVE_MODELS_CMAKE_DESTINATION "CMake")
 else()
     set(AMOR_OPENRAVE_MODELS_CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/AMOR_OPENRAVE_MODELS")
 endif()
 
 # Create dummy CMake configuration export file.
-file(WRITE ${CMAKE_BINARY_DIR}/AMOR_OPENRAVE_MODELSConfig.cmake "# Dummy CMake configuration export file.")
+file(WRITE ${CMAKE_BINARY_DIR}/AMOR_OPENRAVE_MODELSConfig.cmake
+     "# Dummy CMake configuration export file.")
 
 # Install CMake configuration file.
 install(FILES ${CMAKE_BINARY_DIR}/AMOR_OPENRAVE_MODELSConfig.cmake

diff --git a/cmake/AddUninstallTarget.cmake b/cmake/AddUninstallTarget.cmake
diff --git a/cmake/Copyright.txt b/cmake/Copyright.txt
diff --git a/doc/amor-openrave-models-install.md b/doc/amor-openrave-models-install.md
@@ -2,8 +2,9 @@
 
 Dependencies:
 
-- [Install CMake](https://github.com/roboticslab-uc3m/installation-guides/blob/develop/install-cmake.md)
-- [Install YARP](https://github.com/roboticslab-uc3m/installation-guides/blob/develop/install-yarp.md) (CMake modules)
+- [Install CMake 3.5+](https://github.com/roboticslab-uc3m/installation-guides/blob/develop/install-cmake.md)
+- [Install YCM 0.8+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-ycm.md)
+- [Install YARP 2.3.70+](https://github.com/roboticslab-uc3m/installation-guides/blob/develop/install-yarp.md) (CMake modules)
 
 Installation steps: