From d6d07d21d2998cae0467c7857ba8cbd52f2cc1a1 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 24 Sep 2019 16:45:59 +0200
Subject: [PATCH] [CMake] fix python 3
---
CMakeLists.txt | 5 +++--
python/CMakeLists.txt | 10 ++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1120a96..0dede8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ INCLUDE(cmake/base.cmake)
INCLUDE(cmake/test.cmake)
INCLUDE(cmake/python.cmake)
INCLUDE(cmake/hpp.cmake)
+INCLUDE(cmake/boost.cmake)
SET(PROJECT_NAME hpp-centroidal-dynamics)
SET(PROJECT_DESCRIPTION
@@ -27,9 +28,9 @@ IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS} )
- find_package( Boost COMPONENTS python REQUIRED )
+ SET(BOOST_COMPONENTS python)
+ SEARCH_FOR_BOOST()
include_directories(SYSTEM ${Boost_INCLUDE_DIR} )
-
ENDIF(BUILD_PYTHON_INTERFACE)
ADD_REQUIRED_DEPENDENCY("eigen3")
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 37f85a6..2444971 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,23 +1,21 @@
-cmake_minimum_required( VERSION 2.8 )
-
STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
ADD_REQUIRED_DEPENDENCY("eigenpy")
# Define the wrapper library that wraps our library
-add_library( ${PY_NAME} SHARED centroidal_dynamics_python.cpp )
+add_library( ${PY_NAME} SHARED centroidal_dynamics_python )
target_link_libraries( ${PY_NAME} ${Boost_LIBRARIES} ${PROJECT_NAME} )
# don't prepend wrapper library name with lib
set_target_properties( ${PY_NAME} PROPERTIES PREFIX "" )
IF(APPLE)
- # We need to change the extension for python bindings
+ # We need to change the extension for python bindings
SET_TARGET_PROPERTIES(${PY_NAME} PROPERTIES SUFFIX ".so")
ENDIF(APPLE)
PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} eigenpy)
INSTALL(
- TARGETS ${PY_NAME} DESTINATION ${PYTHON_SITELIB}
-)
+ TARGETS ${PY_NAME} DESTINATION ${PYTHON_SITELIB}
+ )
ADD_PYTHON_UNIT_TEST("python-centroidal-dynamics" "python/test/binding_tests.py" "python")
--
GitLab