From 9a9b119d96baeca7df34bdf1e9e5743e1eac5c27 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 26 Nov 2019 18:48:49 +0100
Subject: [PATCH] [CMake] sync submodule
---
CMakeLists.txt | 20 ++++++++------------
cmake | 2 +-
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 367d763..97cd81b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,17 @@
-cmake_minimum_required(VERSION 2.6)
-INCLUDE(cmake/base.cmake)
-INCLUDE(cmake/boost.cmake)
-INCLUDE(cmake/python.cmake)
-INCLUDE(cmake/test.cmake)
-INCLUDE(cmake/hpp.cmake)
+cmake_minimum_required(VERSION 2.8)
SET(PROJECT_NAME hpp-bezier-com-traj)
-SET(PROJECT_DESCRIPTION
- "Multi contact trajectory generation for the COM using Bezier curves"
- )
+SET(PROJECT_DESCRIPTION "Multi contact trajectory generation for the COM using Bezier curves")
+INCLUDE(cmake/hpp.cmake)
+INCLUDE(cmake/boost.cmake)
+INCLUDE(cmake/python.cmake)
+INCLUDE(cmake/test.cmake)
SET(CUSTOM_HEADER_DIR "hpp/bezier-com-traj")
-SETUP_HPP_PROJECT()
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
+PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
# Inhibit all warning messages.
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
@@ -58,5 +56,3 @@ add_subdirectory(tests)
IF(BUILD_PYTHON_INTERFACE)
add_subdirectory (python)
ENDIF(BUILD_PYTHON_INTERFACE)
-
-SETUP_HPP_PROJECT_FINALIZE()
diff --git a/cmake b/cmake
index bbdade9..7eca9ee 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit bbdade93ad2a4b7818cb5d5b9f0bf131627e0b71
+Subproject commit 7eca9ee6c9d1c4ee20eb82272e94f9d11642053a
--
GitLab