From 496e0ed913415a542a90c577b143088cce94a27e Mon Sep 17 00:00:00 2001
From: Florent Lamiraux <florent@laas.fr>
Date: Fri, 21 Jan 2011 09:53:34 +0100
Subject: [PATCH] Revert "Link libdynamicgraph.so with libpython"
This reverts commit 0b9f9528b0c2fc0c57bc433b035babddd2f611ca.
Move python interpreter in dynamic-graph-python.
---
src/CMakeLists.txt | 39 +++++++++++++++++++--------------------
tools/CMakeLists.txt | 2 ++
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90a2e714..c211f470 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,25 +23,6 @@ IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
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
include_directories(${Boost_INCLUDE_DIRS})
@@ -80,7 +61,6 @@ IF (UNIX)
ENDIF (UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
-TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${PYTHON_LIBRARY})
INSTALL(TARGETS ${LIBRARY_NAME}
DESTINATION lib)
@@ -113,3 +93,22 @@ FOREACH(plugin_file ${plugins_list})
INSTALL(TARGETS ${plugin} DESTINATION ${PLUGINDIR})
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})
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 784b02d7..f930695f 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -48,12 +48,14 @@ FOREACH(tool_name ${tools})
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../include
+ ${PYTHON_INCLUDE_PATH}
)
LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
${PROJECT_NAME})
+ TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${PYTHON_LIBRARY})
IF(UNIX)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dl)
--
GitLab