Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
sot-dynamic-pinocchio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guilhem Saurel
sot-dynamic-pinocchio
Commits
e9eda035
Commit
e9eda035
authored
11 years ago
by
Francois Keith
Browse files
Options
Downloads
Patches
Plain Diff
Update lib installation path (multiarch portability).
parent
0edbe3bb
No related branches found
Branches containing commit
Tags
v2.7.0
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
unitTesting/CMakeLists.txt
+1
-1
1 addition, 1 deletion
unitTesting/CMakeLists.txt
with
4 additions
and
4 deletions
CMakeLists.txt
+
2
−
2
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
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
1
−
1
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
}
)
...
...
This diff is collapsed.
Click to expand it.
unitTesting/CMakeLists.txt
+
1
−
1
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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment