Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-dynamic-pinocchio
Commits
e9eda035
Commit
e9eda035
authored
May 23, 2013
by
Francois Keith
Browse files
Update lib installation path (multiarch portability).
parent
0edbe3bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
e9eda035
...
...
@@ -64,8 +64,8 @@ LIST(APPEND libs dynamic)
LIST
(
APPEND LOGGING_WATCHED_TARGETS
${
libs
}
)
# 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_LIBRARY_DIR
(
${
CMAKE_INSTALL_PREFIX
}
/
lib
/plugin
)
PKG_CONFIG_APPEND_LIBS_RAW
(
${
CMAKE_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_LIBDIR
}
/plugin/dynamic.so
)
PKG_CONFIG_APPEND_LIBRARY_DIR
(
${
CMAKE_INSTALL_PREFIX
}
/
${
CMAKE_INSTALL_LIBDIR
}
/plugin
)
# Search for dependencies.
# Boost
...
...
src/CMakeLists.txt
View file @
e9eda035
...
...
@@ -49,7 +49,7 @@ FOREACH(lib ${libs})
PKG_CONFIG_USE_DEPENDENCY
(
${
lib
}
dynamic-graph
)
PKG_CONFIG_USE_DEPENDENCY
(
${
lib
}
jrl-mal
)
INSTALL
(
TARGETS
${
lib
}
DESTINATION
lib
/plugin
)
INSTALL
(
TARGETS
${
lib
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/plugin
)
# build python submodule
STRING
(
REPLACE - _ PYTHON_LIBRARY_NAME
${
lib
}
)
...
...
unitTesting/CMakeLists.txt
View file @
e9eda035
...
...
@@ -73,7 +73,7 @@ FOREACH(test ${tests})
IF
(
UNIX
)
SET
(
EXTRA_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH}
)
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
)
ENDFOREACH
(
test
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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