From 0472ef4ca749295e0f79f3af088bc301c63f3dd6 Mon Sep 17 00:00:00 2001
From: Florent Lamiraux <florent@laas.fr>
Date: Thu, 8 Mar 2012 12:59:15 +0100
Subject: [PATCH] Fix several compilation and installation issues
Rename targets
- dynamic_graph/ros/ros_import/wrap -> ros/ros_import/wrap,
- dynamic_graph/ros/ros_export/wrap -> ros/ros_export/wrap,
- dynamic_graph/ros/ros_joint_state/wrap -> ros/ros_joint_state/wrap.
Add missing linking flags to target interpreter.
Do not redefine PYTHON_SITELIB, use cmake/python.cmake definition.
---
CMakeLists.txt | 9 ++++++---
src/CMakeLists.txt | 6 ------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f4dd41..43d4f97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,9 @@ target_link_libraries(ros_interpreter
# Stand alone remote dynamic-graph Python interpreter.
rosbuild_add_executable(interpreter src/interpreter.cpp)
target_link_libraries(interpreter ros_interpreter)
+rosbuild_add_compile_flags(interpreter ${SOT_CORE_CFLAGS})
+rosbuild_add_link_flags(interpreter ${JRL_MAL_LDFLAGS}
+ ${DYNAMIC_GRAPH_LDFLAGS} ${DYNAMIC_GRAPH_PYTHON_LDFLAGS} ${SOT_CORE_LDFLAGS})
INSTALL(TARGETS ros_bridge DESTINATION lib)
INSTALL(TARGETS ros_import DESTINATION lib)
@@ -94,7 +97,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_import"
ros_import
ros/ros_import/wrap
)
-SET_TARGET_PROPERTIES(dynamic_graph/ros/ros_import/wrap
+SET_TARGET_PROPERTIES(ros/ros_import/wrap
PROPERTIES
COMPILE_FLAGS
${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS}
@@ -106,7 +109,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_export"
ros_export
ros/ros_export/wrap
)
-SET_TARGET_PROPERTIES(dynamic_graph/ros/ros_export/wrap
+SET_TARGET_PROPERTIES(ros/ros_export/wrap
PROPERTIES
COMPILE_FLAGS
${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS}
@@ -118,7 +121,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_joint_state"
ros_joint_state
ros/ros_joint_state/wrap
)
-SET_TARGET_PROPERTIES(dynamic_graph/ros/ros_joint_state/wrap
+SET_TARGET_PROPERTIES(ros/ros_joint_state/wrap
PROPERTIES
COMPILE_FLAGS
${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4ab2d6f..f3a46c4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,2 @@
-EXEC_PROGRAM(
- ${PYTHON_EXECUTABLE}
- ARGS
- "-c \"from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='')\""
- OUTPUT_VARIABLE PYTHON_SITELIB
- )
PYTHON_INSTALL("dynamic_graph/ros" "__init__.py" "${PYTHON_SITELIB}")
PYTHON_INSTALL("dynamic_graph/ros" "ros.py" "${PYTHON_SITELIB}")
\ No newline at end of file
--
GitLab