[ros-catkin] 01/03: New upstream version 0.7.3

Jochen Sprickerhof jspricke at moszumanska.debian.org
Wed Sep 21 06:50:51 UTC 2016


This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to branch master
in repository ros-catkin.

commit 2c281a44eb3575e029dfd5c25054029463f3081d
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Sep 21 08:48:56 2016 +0200

    New upstream version 0.7.3
---
 CHANGELOG.rst              | 4 ++++
 cmake/catkin_package.cmake | 6 +++---
 package.xml                | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 936a67d..01b01b8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package catkin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.3 (2016-09-19)
+------------------
+* relax fixed DEPENDS check from last release (`#825 <https://github.com/ros/catkin/issues/825>`_)
+
 0.7.2 (2016-09-02)
 ------------------
 * change warning to status when nosetests was not found (`#823 <https://github.com/ros/catkin/issues/823>`_)
diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
index ee47981..b43f73d 100644
--- a/cmake/catkin_package.cmake
+++ b/cmake/catkin_package.cmake
@@ -159,9 +159,9 @@ function(_catkin_package)
           #message(WARNING "catkin_package() DEPENDS on catkin package '${depend_name}' which is deprecated. Use CATKIN_DEPENDS for catkin packages instead.")
           list(APPEND _PROJECT_CATKIN_DEPENDS ${depend_name})
         else()
-          if(NOT ${depend_name}_FOUND)
-            message(FATAL_ERROR "catkin_package() DEPENDS on '${depend_name}' which must be find_package()-ed before. If it is a catkin package it can be declared as CATKIN_DEPENDS instead without find_package()-ing it.")
-          endif()
+          # the dependency might not come from a CMake config / module file
+          # but from e.g. PkgConfig / pkg_search_module
+          # therefore this can't expect ${depend_name}_FOUND to be defined
           if(NOT DEFINED ${depend_name}_INCLUDE_DIRS AND NOT DEFINED ${depend_name}_LIBRARIES)
             message(WARNING "catkin_package() DEPENDS on '${depend_name}' but neither '${depend_name}_INCLUDE_DIRS' nor '${depend_name}_LIBRARIES' is defined.")
           endif()
diff --git a/package.xml b/package.xml
index 5dc531f..f9fe4cb 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>catkin</name>
-  <version>0.7.2</version>
+  <version>0.7.3</version>
   <description>Low-level build system macros and infrastructure for ROS.</description>
   <maintainer email="dthomas at osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-catkin.git



More information about the debian-science-commits mailing list