diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 35d8897b36cffec1740f3c43255e6ecdd89766a7..ed8c750b87cb9ff4a7a49da67c6a3c2b44a9d911 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,10 +20,7 @@ INCLUDE(../cmake/python.cmake) FINDPYTHON() INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) -LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) -# provide path to library libdynamic-graph.so -LINK_DIRECTORIES(${DYNAMIC_GRAPH_LIBRARY_DIRS}) -ADD_DEFINITIONS(${DYNAMIC_GRAPH_CFLAGS}) +LINK_DIRECTORIES(${Boost_LIBRARY_DIRS} ${PYTHON_LIBRARY_DIRS}) INCLUDE(../cmake/python.cmake) # @@ -37,7 +34,6 @@ ADD_LIBRARY(${LIBRARY_NAME} interpreter.cc) TARGET_LINK_LIBRARIES(${LIBRARY_NAME} - ${Boost_LIBRARIES} ${PYTHON_LIBRARY}) SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION}) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph) @@ -48,7 +44,7 @@ INSTALL(TARGETS ${LIBRARY_NAME} SET(EXECUTABLE_NAME dg-python) ADD_EXECUTABLE(${EXECUTABLE_NAME} dg-python.cc) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} - ${LIBRARY_NAME} ${Boost_LIBRARIES} + ${LIBRARY_NAME} ) INSTALL(TARGETS dg-python DESTINATION bin) @@ -76,7 +72,8 @@ ADD_LIBRARY(${PYTHON_MODULE} SET_TARGET_PROPERTIES(${PYTHON_MODULE} 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) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}