Skip to content

Commit

Permalink
[CMake] sync submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Oct 31, 2019
1 parent abbadc9 commit 696c701
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
19 changes: 9 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Copyright 2010, François Bleibel, Olivier Stasse, JRL, CNRS/AIST
# Copyright 2010, 2019, François Bleibel, Olivier Stasse, Guilhem Saurel, JRL, CNRS/AIST, LAAS-CNRS
#

CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/python.cmake)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)

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

INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/python.cmake)

SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}")
SET(DOXYGEN_USE_MATHJAX YES)

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

SETUP_PROJECT()
CMAKE_POLICY(SET CMP0048 OLD)
PROJECT(${PROJECT_NAME} CXX)

# Search for dependencies.
ADD_REQUIRED_DEPENDENCY("jrl-walkgen >= 3.2.0")
Expand All @@ -40,7 +41,7 @@ ADD_OPTIONAL_DEPENDENCY("talos_data")
IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
FIND_NUMPY()
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(SYSTEM ${PYTHON_INCLUDE_DIRS})
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python")
SET(PYTHON_LOCAL_PATH "sot/pattern_generator")
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python >= 3.0.0")
Expand All @@ -54,5 +55,3 @@ IF(BUILD_PYTHON_INTERFACE)
ADD_SUBDIRECTORY(python)
ENDIF(BUILD_PYTHON_INTERFACE)
ADD_SUBDIRECTORY(unitTesting)

SETUP_PROJECT_FINALIZE()

0 comments on commit 696c701

Please sign in to comment.