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

Jump to bottom

Mark optional dependencies in package.xml. #376

Merged
merged 4 commits into from
Apr 22, 2018
Merged

Mark optional dependencies in package.xml. #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a3b972
Mark optional dependencies in package.xml.
brianhou Apr 17, 2018
5d756ad
Update CHANGELOG.md.
brianhou Apr 17, 2018
d5c6885
Merge branch 'master' into enhancement/brianhou/optional-deps
gilwoolee Apr 20, 2018
0a7ee19
Require optional dependencies by default.
brianhou Apr 22, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
* Build & Testing & ETC

* Fixed Eigen memory alignment issues on 32bit Ubuntu: [#368](https://github.com/personalrobotics/aikido/pull/368)
* Defined optional dependencies: [#376](https://github.com/personalrobotics/aikido/pull/376)

### 0.2.0 (2018-01-09)

Expand Down
37 changes: 25 additions & 12 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
<!-- Workaround to build DART with optional features enabled. -->
<depend>nlopt</depend>

<!-- Optional dependencies. Uncomment these if you have them installed. -->
<!-- <depend>libmicrohttpd</depend> -->
<!-- <depend>roscpp</depend> -->
<!-- <depend>actionlib</depend> -->
<!-- <depend>control_msgs</depend> -->
<!-- <depend>geometry_msgs</depend> -->
<!-- <depend>interactive_markers</depend> -->
<!-- <depend>std_msgs</depend> -->
<!-- <depend>tf</depend> -->
<!-- <depend>trajectory_msgs</depend> -->
<!-- <depend>visualization_msgs</depend> -->
<!-- <depend>pr_control_msgs</depend> -->
<!-- Optional dependencies. Delete these if you don't have them. -->
<depend>libmicrohttpd</depend>
<depend>roscpp</depend>
<depend>actionlib</depend>
<depend>control_msgs</depend>
<depend>geometry_msgs</depend>
<depend>interactive_markers</depend>
<depend>std_msgs</depend>
<depend>tf</depend>
<depend>trajectory_msgs</depend>
<depend>visualization_msgs</depend>
<depend>pr_control_msgs</depend>

<doc_depend>doxygen</doc_depend>

Expand All @@ -47,5 +47,18 @@

<export>
<build_type>cmake</build_type>

<!-- Optional dependencies. -->
<optional>libmicrohttpd</optional>
<optional>roscpp</optional>
<optional>actionlib</optional>
<optional>control_msgs</optional>
<optional>geometry_msgs</optional>
<optional>interactive_markers</optional>
<optional>std_msgs</optional>
<optional>tf</optional>
<optional>trajectory_msgs</optional>
<optional>visualization_msgs</optional>
<optional>pr_control_msgs</optional>
</export>
</package>