Skip to content
Snippets Groups Projects
Commit e9eda035 authored by Francois Keith's avatar Francois Keith
Browse files

Update lib installation path (multiarch portability).

parent 0edbe3bb
No related branches found
No related tags found
1 merge request!1[major][cpp] starting point to integrate pinocchio
...@@ -64,8 +64,8 @@ LIST(APPEND libs dynamic) ...@@ -64,8 +64,8 @@ LIST(APPEND libs dynamic)
LIST(APPEND LOGGING_WATCHED_TARGETS ${libs}) LIST(APPEND LOGGING_WATCHED_TARGETS ${libs})
# Add dependency toward sot-dynamic library in pkg-config file. # Add dependency toward sot-dynamic library in pkg-config file.
PKG_CONFIG_APPEND_LIBS_RAW(${CMAKE_INSTALL_PREFIX}/lib/plugin/dynamic.so) PKG_CONFIG_APPEND_LIBS_RAW(${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/plugin/dynamic.so)
PKG_CONFIG_APPEND_LIBRARY_DIR(${CMAKE_INSTALL_PREFIX}/lib/plugin) PKG_CONFIG_APPEND_LIBRARY_DIR(${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/plugin)
# Search for dependencies. # Search for dependencies.
# Boost # Boost
......
...@@ -49,7 +49,7 @@ FOREACH(lib ${libs}) ...@@ -49,7 +49,7 @@ FOREACH(lib ${libs})
PKG_CONFIG_USE_DEPENDENCY(${lib} dynamic-graph) PKG_CONFIG_USE_DEPENDENCY(${lib} dynamic-graph)
PKG_CONFIG_USE_DEPENDENCY(${lib} jrl-mal) PKG_CONFIG_USE_DEPENDENCY(${lib} jrl-mal)
INSTALL(TARGETS ${lib} DESTINATION lib/plugin) INSTALL(TARGETS ${lib} DESTINATION ${CMAKE_INSTALL_LIBDIR}/plugin)
# build python submodule # build python submodule
STRING(REPLACE - _ PYTHON_LIBRARY_NAME ${lib}) STRING(REPLACE - _ PYTHON_LIBRARY_NAME ${lib})
......
...@@ -73,7 +73,7 @@ FOREACH(test ${tests}) ...@@ -73,7 +73,7 @@ FOREACH(test ${tests})
IF (UNIX) IF (UNIX)
SET(EXTRA_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH}) SET(EXTRA_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH})
SET_PROPERTY(TEST ${test} PROPERTY SET_PROPERTY(TEST ${test} PROPERTY
ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_BINARY_DIR}/src:${BOOST_ROOT}/lib:${EXTRA_LD_LIBRARY_PATH}") ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}:${CMAKE_BINARY_DIR}/src:${BOOST_ROOT}/lib:${EXTRA_LD_LIBRARY_PATH}")
ENDIF(UNIX) ENDIF(UNIX)
ENDFOREACH(test) ENDFOREACH(test)
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