Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Meta Ros
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
uav-hds
intel-aero
Meta Ros
Commits
080fa48a
Commit
080fa48a
authored
10 years ago
by
Lukas Bulwahn
Browse files
Options
Downloads
Patches
Plain Diff
ros-control: adding patch accepted upstream
parent
2a0777a4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+8
-8
8 additions, 8 deletions
...ake-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
with
8 additions
and
8 deletions
recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+
8
−
8
View file @
080fa48a
From
8c6aa59b2380a5a
a3
9
d7
e815c521407f40640545
Mon Sep 17 00:00:00 2001
From
00fbc3f
a3
0
d7
8c10e13ecd04d85ecf98a39a4bb2
Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date:
Tue, 4 Feb 2014 16:06:33
+0
1
00
Date:
Sun, 27 Jul 2014 09:07:29
+0
2
00
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
Upstream-Status:
Submit
ted
Upstream-Status:
Accep
ted
---
controller_manager_tests/CMakeLists.txt | 3 ++-
joint_limits_interface/CMakeLists.txt | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/controller_manager_tests/CMakeLists.txt b/controller_manager_tests/CMakeLists.txt
index
95c73cc..9e018b1
100644
index
64731bd..badc147
100644
--- a/controller_manager_tests/CMakeLists.txt
+++ b/controller_manager_tests/CMakeLists.txt
@@ -29,7 +29,7 @@
if(USE_ROSBUILD)
...
...
@@ -22,7 +22,7 @@ index 95c73cc..9e018b1 100644
include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})
@@ -5
3
,6 +5
3
,7 @@
else()
@@ -5
4
,6 +5
4
,7 @@
else()
target_link_libraries(dummy_app ${PROJECT_NAME} ${catkin_LIBRARIES})
if(CATKIN_ENABLE_TESTING)
...
...
@@ -31,7 +31,7 @@ index 95c73cc..9e018b1 100644
add_dependencies(tests cm_test)
target_link_libraries(cm_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
diff --git a/joint_limits_interface/CMakeLists.txt b/joint_limits_interface/CMakeLists.txt
index
2ac2b3f..1a7206
1 100644
index
fedaadd..f8305f
1 100644
--- a/joint_limits_interface/CMakeLists.txt
+++ b/joint_limits_interface/CMakeLists.txt
@@ -25,7 +25,6 @@
else() # catkin
...
...
@@ -42,7 +42,7 @@ index 2ac2b3f..1a72061 100644
hardware_interface
urdfdom
)
@@ -4
8
,6 +4
7
,8 @@
else() # catkin
@@ -4
9
,6 +4
8
,8 @@
else() # catkin
)
if(CATKIN_ENABLE_TESTING)
...
...
@@ -52,5 +52,5 @@ index 2ac2b3f..1a72061 100644
target_link_libraries(joint_limits_interface_test ${catkin_LIBRARIES})
--
1.
8
.3
.2
1.
9
.3
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