38 lines
1017 B
Diff
38 lines
1017 B
Diff
From 8b1879e93b8ae2f89df345edaf688521e5c0ab97 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
|
Date: Mon, 15 Jul 2013 14:04:43 +0200
|
|
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
|
|
|
|
Upstream-Status: Accepted
|
|
---
|
|
angles/CMakeLists.txt | 4 +++-
|
|
angles/package.xml | 2 +-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/angles/CMakeLists.txt b/angles/CMakeLists.txt
|
|
index a2cc37f..4026fc6 100644
|
|
--- a/angles/CMakeLists.txt
|
|
+++ b/angles/CMakeLists.txt
|
|
@@ -10,4 +10,6 @@ install(DIRECTORY include/${PROJECT_NAME}/
|
|
|
|
include_directories(include)
|
|
|
|
-add_subdirectory(test)
|
|
+if(CATKIN_ENABLE_TESTING)
|
|
+ add_subdirectory(test)
|
|
+endif()
|
|
diff --git a/angles/package.xml b/angles/package.xml
|
|
index fe7f848..2409595 100644
|
|
--- a/angles/package.xml
|
|
+++ b/angles/package.xml
|
|
@@ -16,5 +16,5 @@
|
|
|
|
<url>http://ros.org/wiki/angles</url>
|
|
|
|
- <buildtool_depend>catkin</buildtool_depend>
|
|
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
|
|
</package>
|
|
--
|
|
1.8.1.6
|
|
|