From da05e006a67893ed3fd3bda44a0262485220f601 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 29 Oct 2019 21:10:15 +0100
Subject: [PATCH] [CMake] sync submodule
---
CMakeLists.txt | 16 ++++++++--------
cmake | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f1f10b..2736043 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
-INCLUDE(cmake/base.cmake)
-INCLUDE(cmake/test.cmake)
-INCLUDE(cmake/python.cmake)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
# Set up project properties
SET(PROJECT_NAMESPACE gepetto)
@@ -10,6 +6,10 @@ SET(PROJECT_NAME example-robot-data)
SET(PROJECT_DESCRIPTION "Set of robot URDFs for benchmarking and developed examples.")
SET(PROJECT_URL https://gepgitlab.laas.fr/${PROJECT_NAMESPACE}/${PROJECT_NAME})
+INCLUDE(cmake/base.cmake)
+INCLUDE(cmake/test.cmake)
+INCLUDE(cmake/python.cmake)
+
# Print initial message
MESSAGE("${PROJECT_DESCRIPTION}, version ${PROJECT_VERSION}")
MESSAGE("Copyright (C) 2018-2019 CNRS-LAAS")
@@ -24,7 +24,9 @@ IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
ENDIF()
-SETUP_PROJECT()
+
+CMAKE_POLICY(SET CMP0048 NEW)
+PROJECT(${PROJECT_NAME} VERSION ${PROJECT_VERSION_FULL} LANGUAGES CXX)
OPTION (BUILD_PYTHON_INTERFACE "Build the python unit tests and helpers" ON)
OPTION (INSTALL_PYTHON_INTERFACE_ONLY "Install *ONLY* the python interface" OFF)
@@ -47,5 +49,3 @@ IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
INSTALL(DIRECTORY tiago_description DESTINATION share/${PROJECT_NAME})
INSTALL(DIRECTORY ur_description DESTINATION share/${PROJECT_NAME})
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
-
-SETUP_PROJECT_FINALIZE()
diff --git a/cmake b/cmake
index 429af97..e6e09c0 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 429af97fe0b858bd73a1747768cc1ac735386140
+Subproject commit e6e09c0b944530c92c17c4fb64cd2a2f63ed46c0
--
GitLab