Update for dynamic-graph-python v4

stack-of-tasks · Sep 2, 2020 · aef6053 · aef6053
1 parent 5b34b4d
commit aef6053
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,20 +15,22 @@ SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
 
 # Project configuration
 SET(CXX_DISABLE_WERROR True)
-SET(CMAKE_CXX_STANDARD 11)
 SET(PROJECT_USE_CMAKE_EXPORT TRUE)
 
 # JRL-cmakemodule setup
 INCLUDE(cmake/base.cmake)
-INCLUDE(cmake/ros.cmake)
+INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/python.cmake)
+INCLUDE(cmake/ros.cmake)
 
 # Project definition
 COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
 PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
+CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
 
 # Project dependencies
 FINDPYTHON()
+SEARCH_FOR_BOOST_PYTHON()
 add_required_dependency(bullet)
 add_required_dependency(urdfdom)
 
@@ -48,7 +50,7 @@ SET(CATKIN_REQUIRED_COMPONENTS
 
 find_package(catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS})
 
-ADD_PROJECT_DEPENDENCY(dynamic-graph-python REQUIRED)
+ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED)
 ADD_PROJECT_DEPENDENCY(dynamic_graph_bridge REQUIRED)
 ADD_PROJECT_DEPENDENCY(sot-core REQUIRED )
 ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED)

diff --git a/cmake b/cmake
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -17,10 +17,10 @@ INSTALL(TARGETS ${DEVICE_NAME} DESTINATION lib)
 
 # build python submodule
 STRING(REPLACE - _ PYTHON_LIBRARY_NAME ${DEVICE_NAME})
-SET(NEW_ENTITY_CLASS ${ENTITIES})
 
 DYNAMIC_GRAPH_PYTHON_MODULE("sot/test/${PYTHON_LIBRARY_NAME}"
-  ${DEVICE_NAME} sot-test-${PYTHON_LIBRARY_NAME}-wrap)
+  ${DEVICE_NAME} sot-test-${PYTHON_LIBRARY_NAME}-wrap
+  MODULE_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/${DEVICE_NAME}-python.hh")
 SET_TARGET_PROPERTIES(sot-test-${PYTHON_LIBRARY_NAME}-wrap PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY ../src) # FIXME: weird catkin / dg interraction
 

diff --git a/tests/sot-test-device-python.hh b/tests/sot-test-device-python.hh
@@ -0,0 +1,3 @@
+#include "sot-test-device.hh"
+
+typedef boost::mpl::vector< SoTTestDevice > entities_t;
+10 −0		.docs/pages/base.rst
+26 −2		.docs/pages/developers.rst
+1 −0		.docs/pages/internal.rst
+1 −0		.gitignore
+32 −3		Config.cmake.in
+10 −0		base.cmake
+86 −75		boost.cmake
+2 −2		compiler.cmake
+23 −0		componentConfig.cmake.in
+79 −0		cxx-standard.cmake
+6 −0		cxx-standard.cpp
+3 −1		cython/cython.cmake
+2 −1		cython/setup.in.py
+0 −70		dynamic_graph/python-module-py.cc
+32 −0		dynamic_graph/python-module-py.cc.in
+3 −19		dynamic_graph/submodule/__init__.py.cmake
+34 −0		find-external/CppAD/Findcppad.cmake
+28 −0		find-external/CppAD/Findcppadcg.cmake
+7 −3		hpp/idl/omniidl_be_python_with_docstring.py
+78 −15		package-config.cmake
+7 −3		pkg-config.cmake
+77 −59		python.cmake
+1 −1		sphinx.cmake
+14 −8		test.cmake
+141 −103		version.cmake
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "sot-test-device.hh"

		typedef boost::mpl::vector< SoTTestDevice > entities_t;