Skip to content
Snippets Groups Projects
Commit 627c94b1 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CMake] clean

parent bcb31a7c
No related branches found
No related tags found
No related merge requests found
...@@ -7,14 +7,10 @@ SET(PROJECT_NAME dynamic-graph-python) ...@@ -7,14 +7,10 @@ SET(PROJECT_NAME dynamic-graph-python)
SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings") SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings")
SET(PROJECT_URL "http://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}") SET(PROJECT_URL "http://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}")
# Export CMake Target
SET(PROJECT_USE_CMAKE_EXPORT TRUE) SET(PROJECT_USE_CMAKE_EXPORT TRUE)
# Make sure that every header is generated in dynamic-graph
SET(CUSTOM_HEADER_DIR "dynamic-graph/python") SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
# Do not fail on warning
SET(CXX_DISABLE_WERROR TRUE) SET(CXX_DISABLE_WERROR TRUE)
SET(DOXYGEN_USE_MATHJAX YES)
INCLUDE(cmake/base.cmake) INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake) INCLUDE(cmake/boost.cmake)
...@@ -23,10 +19,6 @@ INCLUDE(cmake/python.cmake) ...@@ -23,10 +19,6 @@ INCLUDE(cmake/python.cmake)
INCLUDE(cmake/test.cmake) INCLUDE(cmake/test.cmake)
INCLUDE(cmake/sphinx.cmake) INCLUDE(cmake/sphinx.cmake)
SET(DOXYGEN_USE_MATHJAX YES)
SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES}) SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})
CMAKE_POLICY(SET CMP0048 OLD) CMAKE_POLICY(SET CMP0048 OLD)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</description> </description>
<maintainer email="ostasse@laas.fr">Olivier Stasse</maintainer> <maintainer email="ostasse@laas.fr">Olivier Stasse</maintainer>
<license>BSD</license> <license>BSD</license>
<url>http://github.com/stack-of-tasks/dynamic-graph-python</url> <url>http://github.com/stack-of-tasks/dynamic-graph-python</url>
<author>Nicolas Mansard</author> <author>Nicolas Mansard</author>
<author>Olivier Stasse</author> <author>Olivier Stasse</author>
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
<exec_depend>roscpp</exec_depend> <exec_depend>roscpp</exec_depend>
<exec_depend>dynamic-graph</exec_depend> <exec_depend>dynamic-graph</exec_depend>
<build_export_depend>roscpp</build_export_depend> <build_export_depend>roscpp</build_export_depend>
<build_export_depend>dynamic-graph</build_export_depend> <build_export_depend>dynamic-graph</build_export_depend>
<buildtool_depend>catkin</buildtool_depend> <buildtool_depend>catkin</buildtool_depend>
<doc_depend>doxygen</doc_depend> <doc_depend>doxygen</doc_depend>
</package> </package>
...@@ -35,11 +35,8 @@ SET_TARGET_PROPERTIES(${LIBRARY_NAME} ...@@ -35,11 +35,8 @@ SET_TARGET_PROPERTIES(${LIBRARY_NAME}
SOVERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION}
INSTALL_RPATH ${DYNAMIC_GRAPH_PLUGINDIR}) INSTALL_RPATH ${DYNAMIC_GRAPH_PLUGINDIR})
#add_dependencies(${LIBRARY_NAME} dynamic-graph)
target_link_libraries(${LIBRARY_NAME} dynamic-graph::dynamic-graph) target_link_libraries(${LIBRARY_NAME} dynamic-graph::dynamic-graph)
#PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
## Create its bindings ## Create its bindings
## This mimics DYNAMIC_GRAPH_PYTHON_MODULE(${LIBRARY_NAME} ${LIBRARY_NAME} "${LIBRARY_NAME}-wrap") ## This mimics DYNAMIC_GRAPH_PYTHON_MODULE(${LIBRARY_NAME} ${LIBRARY_NAME} "${LIBRARY_NAME}-wrap")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment