From 01f88e9b7c789a7406ef1ea42f97b284f3ce9745 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Tue, 26 Feb 2019 19:11:47 +0100
Subject: [PATCH] [CMake] update cmake submodule use
---
CMakeLists.txt | 26 ++++++++++++--------------
cmake | 2 +-
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7266ecd..c90b8af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,13 +3,12 @@ project(spline)
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/test.cmake)
INCLUDE(cmake/python.cmake)
+INCLUDE(cmake/hpp.cmake)
-SET(PROJECT_ORG humanoid-path-planner)
SET(PROJECT_NAME hpp-spline)
SET(PROJECT_DESCRIPTION
- "template based classes for creating and manipulating spline and bezier curves. Comes with extra options specific to end-effector trajectories in robotics."
- )
-SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
+ "template based classes for creating and manipulating spline and bezier curves. Comes with extra options specific to end-effector trajectories in robotics."
+ )
# Disable -Werror on Unix for now.
SET(CXX_DISABLE_WERROR True)
@@ -18,24 +17,23 @@ SET(CMAKE_VERBOSE_MAKEFILE True)
find_package(Eigen3 REQUIRED)
include_directories(${EIGEN3_INCLUDE_DIR})
-SETUP_PROJECT()
+SETUP_HPP_PROJECT()
OPTION (BUILD_PYTHON_INTERFACE "Build the python binding" ON)
IF(BUILD_PYTHON_INTERFACE)
-# search for python
- FINDPYTHON(2.7 REQUIRED)
- find_package( PythonLibs 2.7 REQUIRED )
- include_directories( ${PYTHON_INCLUDE_DIRS} )
+ # search for python
+ FINDPYTHON(2.7 REQUIRED)
+ find_package( PythonLibs 2.7 REQUIRED )
+ include_directories( ${PYTHON_INCLUDE_DIRS} )
- find_package( Boost COMPONENTS python REQUIRED )
- include_directories( ${Boost_INCLUDE_DIR} )
-
- add_subdirectory (python)
+ find_package( Boost COMPONENTS python REQUIRED )
+ include_directories( ${Boost_INCLUDE_DIR} )
+ add_subdirectory (python)
ENDIF(BUILD_PYTHON_INTERFACE)
ADD_SUBDIRECTORY(include/hpp/spline)
ADD_SUBDIRECTORY(tests)
-SETUP_PROJECT_FINALIZE()
+SETUP_HPP_PROJECT_FINALIZE()
diff --git a/cmake b/cmake
index 77876c4..cea261e 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 77876c449c4a8b20a3e534a6db9eaa47c2b76a0c
+Subproject commit cea261e3da7d383844530070356bca76d20197a8
--
GitLab