Skip to content

Commit 696c701

Browse files
committed
[CMake] sync submodule
1 parent abbadc9 commit 696c701

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

CMakeLists.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright 2010, François Bleibel, Olivier Stasse, JRL, CNRS/AIST
1+
# Copyright 2010, 2019, François Bleibel, Olivier Stasse, Guilhem Saurel, JRL, CNRS/AIST, LAAS-CNRS
22
#
33

4-
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
5-
6-
INCLUDE(cmake/base.cmake)
7-
INCLUDE(cmake/boost.cmake)
8-
INCLUDE(cmake/python.cmake)
4+
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
95

106
SET(PROJECT_NAMESPACE stack-of-tasks)
117
SET(PROJECT_NAME sot-pattern-generator)
128
SET(PROJECT_DESCRIPTION "jrl-walkgen bindings for dynamic-graph.")
139
SET(PROJECT_URL "https://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}")
1410

11+
INCLUDE(cmake/base.cmake)
12+
INCLUDE(cmake/boost.cmake)
13+
INCLUDE(cmake/python.cmake)
14+
1515
SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}")
1616
SET(DOXYGEN_USE_MATHJAX YES)
1717

@@ -27,7 +27,8 @@ SET(PKG_CONFIG_ADDITIONAL_VARIABLES
2727
OPTION(BUILD_PYTHON_INTERFACE "Build the python bindings" ON)
2828
OPTION(INSTALL_PYTHON_INTERFACE_ONLY "Install *ONLY* the python bindings" OFF)
2929

30-
SETUP_PROJECT()
30+
CMAKE_POLICY(SET CMP0048 OLD)
31+
PROJECT(${PROJECT_NAME} CXX)
3132

3233
# Search for dependencies.
3334
ADD_REQUIRED_DEPENDENCY("jrl-walkgen >= 3.2.0")
@@ -40,7 +41,7 @@ ADD_OPTIONAL_DEPENDENCY("talos_data")
4041
IF(BUILD_PYTHON_INTERFACE)
4142
FINDPYTHON()
4243
FIND_NUMPY()
43-
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
44+
INCLUDE_DIRECTORIES(SYSTEM ${PYTHON_INCLUDE_DIRS})
4445
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python")
4546
SET(PYTHON_LOCAL_PATH "sot/pattern_generator")
4647
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python >= 3.0.0")
@@ -54,5 +55,3 @@ IF(BUILD_PYTHON_INTERFACE)
5455
ADD_SUBDIRECTORY(python)
5556
ENDIF(BUILD_PYTHON_INTERFACE)
5657
ADD_SUBDIRECTORY(unitTesting)
57-
58-
SETUP_PROJECT_FINALIZE()

0 commit comments

Comments
 (0)