Commit cd818538 authored by Francois Keith's avatar Francois Keith Committed by Francois Keith
Browse files

Correct link and dependencies

parent d43f475b
...@@ -20,10 +20,7 @@ INCLUDE(../cmake/python.cmake) ...@@ -20,10 +20,7 @@ INCLUDE(../cmake/python.cmake)
FINDPYTHON() FINDPYTHON()
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS} ${PYTHON_LIBRARY_DIRS})
# provide path to library libdynamic-graph.so
LINK_DIRECTORIES(${DYNAMIC_GRAPH_LIBRARY_DIRS})
ADD_DEFINITIONS(${DYNAMIC_GRAPH_CFLAGS})
INCLUDE(../cmake/python.cmake) INCLUDE(../cmake/python.cmake)
# #
...@@ -37,7 +34,6 @@ ADD_LIBRARY(${LIBRARY_NAME} ...@@ -37,7 +34,6 @@ ADD_LIBRARY(${LIBRARY_NAME}
interpreter.cc) interpreter.cc)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
${Boost_LIBRARIES}
${PYTHON_LIBRARY}) ${PYTHON_LIBRARY})
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION}) SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
...@@ -48,7 +44,7 @@ INSTALL(TARGETS ${LIBRARY_NAME} ...@@ -48,7 +44,7 @@ INSTALL(TARGETS ${LIBRARY_NAME}
SET(EXECUTABLE_NAME dg-python) SET(EXECUTABLE_NAME dg-python)
ADD_EXECUTABLE(${EXECUTABLE_NAME} dg-python.cc) ADD_EXECUTABLE(${EXECUTABLE_NAME} dg-python.cc)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
${LIBRARY_NAME} ${Boost_LIBRARIES} ${LIBRARY_NAME}
) )
INSTALL(TARGETS dg-python DESTINATION bin) INSTALL(TARGETS dg-python DESTINATION bin)
...@@ -76,7 +72,8 @@ ADD_LIBRARY(${PYTHON_MODULE} ...@@ -76,7 +72,8 @@ ADD_LIBRARY(${PYTHON_MODULE}
SET_TARGET_PROPERTIES(${PYTHON_MODULE} SET_TARGET_PROPERTIES(${PYTHON_MODULE}
PROPERTIES PREFIX "") PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(${PYTHON_MODULE} ${DYNAMIC_GRAPH_LIBRARIES}) PKG_CONFIG_USE_DEPENDENCY(${PYTHON_MODULE} dynamic-graph)
TARGET_LINK_LIBRARIES(${PYTHON_MODULE})
CONFIG_FILES(link-to-python.hh) CONFIG_FILES(link-to-python.hh)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
......
Supports Markdown
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