Pull latest YCM, update bootstrap files

roboticslab-uc3m/developer-manual#18 (comment)
roboticslab-uc3m · Mar 23, 2018 · 8c44d34 · 8c44d34
1 parent 21217c3
commit 8c44d34
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,18 +4,15 @@
 # Contrib: Lorenzo Natale (author of iCub/main/CMakeLists.txt)
 # CopyPolicy: Released under the terms of the GNU GPL v2.0.
 
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 project(ASIBOT_MAIN)
 
 # Pick up our CMake modules.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake
                               ${CMAKE_SOURCE_DIR}/cmake/ycm-modules)
 
-# Bootstrap YCM. Stick to v0.2.2 because of:
-# https://github.com/robotology/ycm/issues/118
-# ...and to keep YCM itself compatible with cmake_minimum_required().
-set(YCM_TAG v0.2.2)
+# Bootstrap YCM. Keep it compatible with cmake_minimum_required().
 include(YCMBootstrap)
 
 # Superbuild phase.

diff --git a/cmake/ycm-modules/IncludeUrl.cmake b/cmake/ycm-modules/IncludeUrl.cmake
@@ -75,7 +75,7 @@
 # argument.
 
 #=============================================================================
-# Copyright 2013-2015 iCub Facility, Istituto Italiano di Tecnologia
+# Copyright 2013-2015 Istituto Italiano di Tecnologia (IIT)
 # Copyright 2013-2015 Daniele E. Domenichelli <ddomenichelli@drdanz.it>
 #
 # Distributed under the OSI-approved BSD License (the "License");

diff --git a/cmake/ycm-modules/YCMBootstrap.cmake b/cmake/ycm-modules/YCMBootstrap.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright 2013-2014 iCub Facility, Istituto Italiano di Tecnologia
+# Copyright 2013-2014 Istituto Italiano di Tecnologia (IIT)
 #   Authors: Daniele E. Domenichelli <daniele.domenichelli@iit.it>
 #
 # Distributed under the OSI-approved BSD License (the "License");
@@ -78,6 +78,7 @@ if(NOT DEFINED USE_SYSTEM_YCM OR USE_SYSTEM_YCM)
     endif()
     if(YCM_FOUND)
         message(STATUS "YCM found in ${YCM_MODULE_DIR}.")
+        set_property(GLOBAL APPEND PROPERTY YCM_PROJECTS YCM)
         return()
     endif()
 endif()