Commit d0269019 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub

Merge pull request #21 from nim65s/devel

[CMake] details
parents 703d6836 8bdd7dec
Pipeline #1098 passed with stage
in 1 minute and 36 seconds
Subproject commit 4e78d6f1ece19639c6ebdda18b2f081c784e3d04
Subproject commit dc8b946d456d2c41ad12b819111b005148c68031
......@@ -21,10 +21,11 @@ INCLUDE(cmake/eigen.cmake)
INCLUDE(cmake/pthread.cmake)
INCLUDE(cmake/cpack.cmake)
include(cmake/header.cmake)
include(cmake/python.cmake)
SET(PROJECT_NAME dynamic-graph-python)
SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings")
SET(PROJECT_URL "http://github.com/jrl-umi3218/dynamic-graph-python")
SET(PROJECT_URL "http://github.com/stack-of-tasks/dynamic-graph-python")
SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
# Headers list.
......@@ -39,6 +40,8 @@ SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES}
SETUP_PROJECT()
FINDPYTHON()
# Trigger dependency to dynamic-graph.
ADD_REQUIRED_DEPENDENCY("dynamic-graph >= 3.0.0")
......
Subproject commit 8e9b46446f92899025173f047b3950fcd21b89f4
Subproject commit 8e7bedfcbd8524c0401a58fd74edc07c3d4308d0
......@@ -16,14 +16,10 @@
#
# Python
#
set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
INCLUDE(../cmake/python.cmake)
FINDPYTHON()
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS} ${PYTHON_LIBRARY_DIRS})
INCLUDE(../cmake/python.cmake)
#
#
# Python interpreter
......@@ -36,6 +32,7 @@ ADD_LIBRARY(${LIBRARY_NAME}
TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
${PYTHON_LIBRARY})
TARGET_LINK_BOOST_PYTHON(${LIBRARY_NAME})
IF(UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
......@@ -46,14 +43,14 @@ SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
INSTALL(TARGETS ${LIBRARY_NAME}
DESTINATION ${CMAKE_INSTALL_LIBDIR})
DESTINATION lib)
SET(EXECUTABLE_NAME dg-python)
ADD_EXECUTABLE(${EXECUTABLE_NAME} dg-python.cc)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
${LIBRARY_NAME}
)
INSTALL(TARGETS dg-python DESTINATION ${CMAKE_INSTALL_BINDIR})
INSTALL(TARGETS dg-python DESTINATION bin)
#
#
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment