Skip to content

Commit

Permalink
Require YCM and newer YARP, bump CMake to 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Jun 18, 2018
1 parent 16741d2 commit 1591259
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 131 deletions.
24 changes: 11 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
cmake_minimum_required(VERSION 2.8.9)
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)

# Define a project.
project(AMOR_CONFIGURATION_FILES)
project(AMOR_CONFIGURATION_FILES 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)
Expand All @@ -35,7 +32,8 @@ else()
endif()

# Create dummy CMake configuration export file.
file(WRITE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake "# Dummy CMake configuration export file.")
file(WRITE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake
"# Dummy CMake configuration export file.")

# Install CMake configuration file.
install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake
Expand Down
70 changes: 0 additions & 70 deletions cmake/AddUninstallTarget.cmake

This file was deleted.

48 changes: 0 additions & 48 deletions cmake/Copyright.txt

This file was deleted.

0 comments on commit 1591259

Please sign in to comment.