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
e488acf8
Commit
e488acf8
authored
11 years ago
by
Lukas Bulwahn
Browse files
Options
Downloads
Patches
Plain Diff
xacro: initial commit
parent
9b3249d0
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
recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
+40
-0
40 additions, 0 deletions
...os/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
recipes-ros/xacro/xacro_1.8.4.bb
+12
-0
12 additions, 0 deletions
recipes-ros/xacro/xacro_1.8.4.bb
with
52 additions
and
0 deletions
recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
0 → 100644
+
40
−
0
View file @
e488acf8
From 1a534325ce98bd1250c3f586b243c85a0515fcac Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 12 Oct 2013 11:14:26 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
CMakeLists.txt | 6 ++++--
package.xml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d67593..f68faa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,5 +16,7 @@
install(PROGRAMS xacro.py DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(PROGRAMS scripts/xacro DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
-## Add folders to be run by python nosetests
-catkin_add_nosetests(test)
+if(CATKIN_ENABLE_TESTING)
+ ## Add folders to be run by python nosetests
+ catkin_add_nosetests(test)
+endif()
diff --git a/package.xml b/package.xml
index 69cb9e7..26f61e2 100644
--- a/package.xml
+++ b/package.xml
@@ -17,7 +17,7 @@
<author>Stuart Glaser</author>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>roslaunch</run_depend>
--
1.8.1.2
This diff is collapsed.
Click to expand it.
recipes-ros/xacro/xacro_1.8.4.bb
0 → 100644
+
12
−
0
View file @
e488acf8
DESCRIPTION = "Xacro is an XML macro language."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "32848b03f52b6a4b4040ccc4634c13ce"
SRC_URI[sha256sum] = "44f7190cecab31ab67460d40c7872d99fe89907fad20106dbf5205f33ba54718"
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch"
inherit catkin
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