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
Guilhem Saurel
dynamic_graph_bridge
Commits
d55eee41
Commit
d55eee41
authored
5 years ago
by
Olivier Stasse
Committed by
Guilhem Saurel
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove RunPythonFile.srv
Update CMakeLists.txt to link with ros_bridge
parent
c7356125
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
+18
-13
18 additions, 13 deletions
CMakeLists.txt
srv/RunPythonFile.srv
+0
-3
0 additions, 3 deletions
srv/RunPythonFile.srv
with
18 additions
and
16 deletions
CMakeLists.txt
+
18
−
13
View file @
d55eee41
...
...
@@ -160,7 +160,9 @@ IF(BUILD_PYTHON_INTERFACE)
set_target_properties
(
ros_interpreter PROPERTIES BUILD_WITH_INSTALL_RPATH True
LIBRARY_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/lib
)
message
(
cmakeinstalllibdir
" is
${
CMAKE_INSTALL_LIBDIR
}
"
)
install
(
TARGETS ros_interpreter DESTINATION lib
)
install
(
TARGETS ros_interpreter
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION lib
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
...
...
@@ -176,19 +178,16 @@ add_library(sot_loader src/sot_loader.cpp src/sot_loader_basic.cpp)
pkg_config_use_dependency
(
sot_loader dynamic-graph
)
pkg_config_use_dependency
(
sot_loader sot-core
)
target_link_libraries
(
sot_loader
${
Boost_LIBRARIES
}
roscpp ros_bridge tf2_ros
)
install
(
TARGETS sot_loader DESTINATION lib
)
install
(
TARGETS sot_loader
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION lib
)
add_subdirectory
(
src
)
add_subdirectory
(
tests
)
# Deal with the ROS part.
add_service_files
(
FILES RunPythonFile.srv
)
generate_messages
(
DEPENDENCIES std_msgs
)
# This is necessary so that the pc file generated by catking is similar to the on
# done directly by jrl-cmake-modules
catkin_package
(
CATKIN_DEPENDS message_runtime roscpp realtime_tools
${
SOT_PKGNAMES
}
tf2_ros
catkin_package
(
INCLUDE_DIRS include
CATKIN_DEPENDS message_runtime roscpp realtime_tools
${
SOT_PKGNAMES
}
tf2_ros
LIBRARIES
${
CATKIN_DEPENDS_LIBRARIES
}
)
...
...
@@ -206,11 +205,17 @@ IF(BUILD_PYTHON_INTERFACE)
DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
# Service file.
install
(
FILES ./srv/RunPythonFile.srv DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/share/
${
PROJECT_NAME
}
/srv
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
message
(
cmake_install_bindir
" is
${
CMAKE_INSTALL_BINDIR
}
"
)
install
(
TARGETS geometric_simu DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
install
(
FILES manifest.xml DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/share/
${
PROJECT_NAME
}
/
)
# Install the geometrical simulation node
install
(
TARGETS geometric_simu
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
# Install package information
install
(
FILES manifest.xml
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/share/
${
PROJECT_NAME
}
/
)
This diff is collapsed.
Click to expand it.
srv/RunPythonFile.srv
deleted
100644 → 0
+
0
−
3
View file @
c7356125
string input
---
string result
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