From f811060ede22a331c8d2a32d97130ea5211e892f Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Mon, 29 Oct 2012 17:23:28 +0100
Subject: [PATCH] [wip/catkin] Update depend.mk
. Add rospack as an indirect dependency of catkin
. Add %-config.cmake in SYSTEM_SEARCH, so that cmake sysdep will
add -Dcatkin_DIR et al.
---
catkin/depend.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/catkin/depend.mk b/catkin/depend.mk
index b8759a20..0e7b4168 100644
--- a/catkin/depend.mk
+++ b/catkin/depend.mk
@@ -21,8 +21,11 @@ DEPEND_DIR.catkin?= ../../wip/catkin
SYSTEM_SEARCH.catkin=\
'lib/pkgconfig/catkin.pc:/Version/s/[^0-9.]//gp' \
+ 'share/catkin/cmake/catkin-config.cmake' \
+ 'share/ros/cmake/ros-config.cmake' \
'${PYTHON_SYSLIBSEARCH}/catkin/__init__.py'
+include ../../wip/rospack/depend.mk
include ../../mk/sysdep/python.mk
include ../../mk/sysdep/cmake.mk
--
GitLab