Skip to content
Snippets Groups Projects
Commit 0472ef4c authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

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.
parent 0b8e5ef2
No related branches found
No related tags found
No related merge requests found
...@@ -77,6 +77,9 @@ target_link_libraries(ros_interpreter ...@@ -77,6 +77,9 @@ target_link_libraries(ros_interpreter
# Stand alone remote dynamic-graph Python interpreter. # Stand alone remote dynamic-graph Python interpreter.
rosbuild_add_executable(interpreter src/interpreter.cpp) rosbuild_add_executable(interpreter src/interpreter.cpp)
target_link_libraries(interpreter ros_interpreter) 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_bridge DESTINATION lib)
INSTALL(TARGETS ros_import DESTINATION lib) INSTALL(TARGETS ros_import DESTINATION lib)
...@@ -94,7 +97,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_import" ...@@ -94,7 +97,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_import"
ros_import ros_import
ros/ros_import/wrap ros/ros_import/wrap
) )
SET_TARGET_PROPERTIES(dynamic_graph/ros/ros_import/wrap SET_TARGET_PROPERTIES(ros/ros_import/wrap
PROPERTIES PROPERTIES
COMPILE_FLAGS COMPILE_FLAGS
${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS} ${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS}
...@@ -106,7 +109,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_export" ...@@ -106,7 +109,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_export"
ros_export ros_export
ros/ros_export/wrap ros/ros_export/wrap
) )
SET_TARGET_PROPERTIES(dynamic_graph/ros/ros_export/wrap SET_TARGET_PROPERTIES(ros/ros_export/wrap
PROPERTIES PROPERTIES
COMPILE_FLAGS COMPILE_FLAGS
${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS} ${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS}
...@@ -118,7 +121,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_joint_state" ...@@ -118,7 +121,7 @@ DYNAMIC_GRAPH_PYTHON_MODULE("ros/ros_joint_state"
ros_joint_state ros_joint_state
ros/ros_joint_state/wrap ros/ros_joint_state/wrap
) )
SET_TARGET_PROPERTIES(dynamic_graph/ros/ros_joint_state/wrap SET_TARGET_PROPERTIES(ros/ros_joint_state/wrap
PROPERTIES PROPERTIES
COMPILE_FLAGS COMPILE_FLAGS
${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS} ${JRL_MAL_CFLAGS} ${DYNAMIC_GRAPH_CFLAGS} ${SOT_CORE_CFLAGS}
......
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" "__init__.py" "${PYTHON_SITELIB}")
PYTHON_INSTALL("dynamic_graph/ros" "ros.py" "${PYTHON_SITELIB}") PYTHON_INSTALL("dynamic_graph/ros" "ros.py" "${PYTHON_SITELIB}")
\ No newline at end of file
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