Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consider test_depends for dependencies #612

Merged
merged 1 commit into from
Apr 11, 2014
Merged

consider test_depends for dependencies #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmake/catkin_workspace.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#
# Search all subfolders in the workspace for ``package.xml`` files.
# Based on the dependencies specified in the ``build_depends`` and
# ``buildtool_depends`` tags it performs a topological sort and calls
# Based on the dependencies specified in the ``build_depends``,
# ``buildtool_depends`` and (as of package format version 2)
# ``test_depends`` tags it performs a topological sort and calls
# ``add_subdirectory()`` for each directory.
#
# The functions is only called in catkin's ``toplevel.cmake``, which
Expand Down
4 changes: 2 additions & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<build_depend>gtest</build_depend>
<build_depend>python-argparse</build_depend>
<build_depend version_gte="0.1.26">python-catkin-pkg</build_depend>
<build_depend version_gte="0.2.0">python-catkin-pkg</build_depend>
<build_depend>python-empy</build_depend>
<build_depend>python-nose</build_depend>

Expand All @@ -26,7 +26,7 @@
<run_depend>cmake</run_depend>
<run_depend>gtest</run_depend>
<run_depend>python-argparse</run_depend>
<run_depend version_gte="0.1.26">python-catkin-pkg</run_depend>
<run_depend version_gte="0.2.0">python-catkin-pkg</run_depend>
<run_depend>python-empy</run_depend>
<run_depend>python-nose</run_depend>

Expand Down
2 changes: 1 addition & 1 deletion python/catkin/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ def get_package_names_with_recursive_dependencies(packages, pkg_names):
if pkg_name in packages_by_name:
pkg = packages_by_name[pkg_name]
dependencies.add(pkg_name)
for dep in [dep.name for dep in (pkg.build_depends + pkg.buildtool_depends + pkg.run_depends)]:
for dep in [dep.name for dep in (pkg.build_depends + pkg.buildtool_depends + pkg.run_depends + (pkg.test_depends if pkg.package_format > 1 else []))]:
if dep in packages_by_name and dep not in check_pkg_names and dep not in dependencies:
check_pkg_names.add(dep)
return dependencies