Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic_graph_bridge
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
Stack Of Tasks
dynamic_graph_bridge
Commits
b7a19578
Commit
b7a19578
authored
2 years ago
by
pre-commit-ci[bot]
Browse files
Options
Downloads
Patches
Plain Diff
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see
https://pre-commit.ci
parent
527a1e42
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-2
3 additions, 2 deletions
CMakeLists.txt
src/CMakeLists.txt
+8
-10
8 additions, 10 deletions
src/CMakeLists.txt
with
11 additions
and
12 deletions
CMakeLists.txt
+
3
−
2
View file @
b7a19578
...
@@ -76,8 +76,9 @@ add_library(ros_bridge SHARED ${${PROJECT_NAME}_SOURCES}
...
@@ -76,8 +76,9 @@ add_library(ros_bridge SHARED ${${PROJECT_NAME}_SOURCES}
${${
PROJECT_NAME
}
_HEADERS
}
)
${${
PROJECT_NAME
}
_HEADERS
}
)
target_include_directories
(
ros_bridge SYSTEM PUBLIC
${
catkin_INCLUDE_DIRS
}
)
target_include_directories
(
ros_bridge SYSTEM PUBLIC
${
catkin_INCLUDE_DIRS
}
)
target_include_directories
(
ros_bridge PUBLIC $<INSTALL_INTERFACE:include>
)
target_include_directories
(
ros_bridge PUBLIC $<INSTALL_INTERFACE:include>
)
target_link_libraries
(
ros_bridge
${
catkin_LIBRARIES
}
sot-core::sot-core
target_link_libraries
(
pinocchio::pinocchio dynamic_graph_bridge_msgs::dynamic_graph_bridge_msgs
)
ros_bridge
${
catkin_LIBRARIES
}
sot-core::sot-core pinocchio::pinocchio
dynamic_graph_bridge_msgs::dynamic_graph_bridge_msgs
)
if
(
SUFFIX_SO_VERSION
)
if
(
SUFFIX_SO_VERSION
)
set_target_properties
(
ros_bridge PROPERTIES SOVERSION
${
PROJECT_VERSION
}
)
set_target_properties
(
ros_bridge PROPERTIES SOVERSION
${
PROJECT_VERSION
}
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
8
−
10
View file @
b7a19578
...
@@ -10,8 +10,8 @@ foreach(plugin ${plugins})
...
@@ -10,8 +10,8 @@ foreach(plugin ${plugins})
${
PROJECT_VERSION
}
)
${
PROJECT_VERSION
}
)
endif
(
SUFFIX_SO_VERSION
)
endif
(
SUFFIX_SO_VERSION
)
target_link_libraries
(
target_link_libraries
(
${
LIBRARY_NAME
}
${${
LIBRARY_NAME
}
_deps
}
${
LIBRARY_NAME
}
${${
LIBRARY_NAME
}
_deps
}
${
catkin_LIBRARIES
}
ros_bridge
)
${
catkin_LIBRARIES
}
ros_bridge
)
if
(
NOT INSTALL_PYTHON_INTERFACE_ONLY
)
if
(
NOT INSTALL_PYTHON_INTERFACE_ONLY
)
install
(
install
(
...
@@ -45,9 +45,8 @@ if(BUILD_PYTHON_INTERFACE)
...
@@ -45,9 +45,8 @@ if(BUILD_PYTHON_INTERFACE)
# ros_interperter library.
# ros_interperter library.
add_library
(
ros_interpreter ros_interpreter.cpp
)
add_library
(
ros_interpreter ros_interpreter.cpp
)
target_link_libraries
(
target_link_libraries
(
ros_interpreter ros_bridge
${
catkin_LIBRARIES
}
ros_interpreter ros_bridge
${
catkin_LIBRARIES
}
dynamic-graph-python::dynamic-graph-python
)
dynamic-graph-python::dynamic-graph-python
)
install
(
install
(
TARGETS ros_interpreter
TARGETS ros_interpreter
...
@@ -58,15 +57,14 @@ endif(BUILD_PYTHON_INTERFACE)
...
@@ -58,15 +57,14 @@ endif(BUILD_PYTHON_INTERFACE)
# Stand alone embedded intepreter with a robot controller.
# Stand alone embedded intepreter with a robot controller.
add_executable
(
geometric_simu geometric_simu.cpp sot_loader.cpp
add_executable
(
geometric_simu geometric_simu.cpp sot_loader.cpp
sot_loader_basic.cpp
)
sot_loader_basic.cpp
)
target_link_libraries
(
target_link_libraries
(
geometric_simu Boost::program_options
${
CMAKE_DL_LIBS
}
geometric_simu Boost::program_options
${
CMAKE_DL_LIBS
}
${
catkin_LIBRARIES
}
${
catkin_LIBRARIES
}
ros_bridge
)
ros_bridge
)
install
(
TARGETS geometric_simu DESTINATION lib/
${
PROJECT_NAME
}
)
install
(
TARGETS geometric_simu DESTINATION lib/
${
PROJECT_NAME
}
)
# Sot loader library
# Sot loader library
add_library
(
sot_loader sot_loader.cpp sot_loader_basic.cpp
)
add_library
(
sot_loader sot_loader.cpp sot_loader_basic.cpp
)
target_link_libraries
(
target_link_libraries
(
sot_loader Boost::program_options
${
catkin_LIBRARIES
}
sot_loader Boost::program_options
${
catkin_LIBRARIES
}
ros_bridge
)
ros_bridge
)
install
(
install
(
TARGETS sot_loader
TARGETS sot_loader
EXPORT
${
TARGETS_EXPORT_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
...
...
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