Commit d0c04c4d authored by Olivier Stasse's avatar Olivier Stasse

[cmake] Set PLUGINDIR to prevent problem with DYNAMIC_GRAPH_PLUGINDIR

when using the cmake recipe.
parent a87c7950
......@@ -35,6 +35,11 @@ SET(PKG_CONFIG_ADDITIONAL_VARIABLES
plugindir
)
# Specific to PKG module
# FIXME: to be changed into lib/dynamic-graph
# to avoid name collision when installing dynamic-graph in /usr.
SET(PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/plugin")
# Extra macros for sot-core
install(FILES "src/sot-coreMacros.cmake"
DESTINATION "${CONFIG_INSTALL_DIR}")
......
......@@ -221,7 +221,7 @@ FOREACH(plugin ${plugins})
SET_TARGET_PROPERTIES(${LIBRARY_NAME}
PROPERTIES
INSTALL_RPATH ${DYNAMIC_GRAPH_PLUGINDIR}
INSTALL_RPATH ${PLUGINDIR}
)
IF (${SUFFIX_SO_VERSION})
SET_TARGET_PROPERTIES(${LIBRARY_NAME}
......@@ -265,7 +265,7 @@ FOREACH(plugin ${plugins})
EXPORT ${TARGETS_EXPORT_NAME}
PUBLIC_HEADER
INCLUDES DESTINATION include
LIBRARY DESTINATION ${DYNAMIC_GRAPH_PLUGINDIR}
LIBRARY DESTINATION ${PLUGINDIR}
)
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment