Skip to content
Snippets Groups Projects
Commit 496e0ed9 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Revert "Link libdynamicgraph.so with libpython"

       This reverts commit 0b9f9528.
       Move python interpreter in dynamic-graph-python.
parent b8fa2b31
No related branches found
No related tags found
No related merge requests found
...@@ -23,25 +23,6 @@ IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")) ...@@ -23,25 +23,6 @@ IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG) ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")) ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
#
# Python
#
INCLUDE(FindPythonLibs)
IF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
MESSAGE(FATAL_ERROR "Python has not been found.")
ENDIF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
INCLUDE(FindPythonInterp)
IF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
MESSAGE(FATAL_ERROR "Python executable has not been found.")
ENDIF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
# provide path to library libdynamic-graph.so
LINK_DIRECTORIES(${DYNAMIC_GRAPH_LIBRARY_DIRS})
ADD_DEFINITIONS(${DYNAMIC_GRAPH_CFLAGS})
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
# Declare boost include directories # Declare boost include directories
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
...@@ -80,7 +61,6 @@ IF (UNIX) ...@@ -80,7 +61,6 @@ IF (UNIX)
ENDIF (UNIX) ENDIF (UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES}) TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${PYTHON_LIBRARY})
INSTALL(TARGETS ${LIBRARY_NAME} INSTALL(TARGETS ${LIBRARY_NAME}
DESTINATION lib) DESTINATION lib)
...@@ -113,3 +93,22 @@ FOREACH(plugin_file ${plugins_list}) ...@@ -113,3 +93,22 @@ FOREACH(plugin_file ${plugins_list})
INSTALL(TARGETS ${plugin} DESTINATION ${PLUGINDIR}) INSTALL(TARGETS ${plugin} DESTINATION ${PLUGINDIR})
ENDFOREACH(plugin_file) ENDFOREACH(plugin_file)
#
# Python
#
INCLUDE(FindPythonLibs)
IF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
MESSAGE(FATAL_ERROR "Python has not been found.")
ENDIF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE)
INCLUDE(FindPythonInterp)
IF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
MESSAGE(FATAL_ERROR "Python executable has not been found.")
ENDIF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE)
# provide path to library libdynamic-graph.so
LINK_DIRECTORIES(${DYNAMIC_GRAPH_LIBRARY_DIRS})
ADD_DEFINITIONS(${DYNAMIC_GRAPH_CFLAGS})
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
...@@ -48,12 +48,14 @@ FOREACH(tool_name ${tools}) ...@@ -48,12 +48,14 @@ FOREACH(tool_name ${tools})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../include
${PYTHON_INCLUDE_PATH}
) )
LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib) LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
${PROJECT_NAME}) ${PROJECT_NAME})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${PYTHON_LIBRARY})
IF(UNIX) IF(UNIX)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dl) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dl)
......
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