Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
sot-hrp2
Commits
fb607c4c
Commit
fb607c4c
authored
May 23, 2013
by
Francois Keith
Browse files
Update lib installation path (multiarch portability).
parent
7c296f32
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
fb607c4c
...
...
@@ -63,7 +63,7 @@ SEARCH_FOR_BOOST()
# libraries inclusion
SET
(
CMAKE_SKIP_BUILD_RPATH FALSE
)
SET
(
CMAKE_BUILD_WITH_INSTALL_RPATH FALSE
)
SET
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/
lib
"
)
SET
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_LIBDIR
}
"
)
SET
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
# Add subdirectories.
...
...
src/CMakeLists.txt
View file @
fb607c4c
...
...
@@ -29,7 +29,7 @@ FUNCTION(COMPILE_PLUGIN NAME SOURCES ENTITIES)
PKG_CONFIG_USE_DEPENDENCY
(
${
NAME
}
sot-core
)
PKG_CONFIG_USE_DEPENDENCY
(
${
NAME
}
jrl-dynamics
)
INSTALL
(
TARGETS
${
NAME
}
DESTINATION
lib
/plugin
)
INSTALL
(
TARGETS
${
NAME
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/plugin
)
# build python submodule
STRING
(
REPLACE - _ PYTHON_LIBRARY_NAME
${
NAME
}
)
...
...
@@ -97,7 +97,7 @@ MACRO(build_hrp2_controller robotnumber)
TARGET_LINK_LIBRARIES
(
${
CONTROLLER_NAME
}
${
Boost_LIBRARIES
}
)
ENDIF
(
UNIX AND NOT APPLE
)
INSTALL
(
TARGETS
${
CONTROLLER_NAME
}
DESTINATION
lib
)
INSTALL
(
TARGETS
${
CONTROLLER_NAME
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
# build python submodule
STRING
(
REPLACE - _ PYTHON_LIBRARY_NAME
${
CONTROLLER_NAME
}
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment