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.

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

Cmake modules uuid #8

Merged
merged 4 commits into from
Oct 28, 2014
Merged

Cmake modules uuid #8

merged 4 commits into from
Oct 28, 2014

Conversation

esteve
Copy link
Member

@esteve esteve commented Oct 27, 2014

Solves #6

Depends on ros/cmake_modules@b45081a

@@ -16,6 +16,7 @@

<build_depend>bond</build_depend>
<build_depend>boost</build_depend>
<build_depend>cmake_modules</build_depend>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a version dependency.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ros/cmake_modules would need a new release, @wjwwood could you release it? This looks like an important fix for all Yosemite users.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dirk-thomas
Copy link
Member

Why do a 1.7.14 before the changes?

@esteve
Copy link
Member Author

esteve commented Oct 27, 2014

@dirk-thomas I don't really know why the diff shows that, bond_core is already at 1.7.14

@dirk-thomas
Copy link
Member

You might want to make sure that the 1.7.14 commit is not part of this PR. From https://github.com/ros/bond_core/commits/cmake-modules-uuid it looks like that you have recommitted the 1.7.14 comit on the branch 4 days ago.

@esteve
Copy link
Member Author

esteve commented Oct 27, 2014

@dirk-thomas Fixed, rebased against master.

@@ -2,20 +2,16 @@ cmake_minimum_required(VERSION 2.8.3)
project(bondcpp)

find_package(Boost REQUIRED)
find_package(catkin REQUIRED bond roscpp smclib)
find_package(catkin REQUIRED bond roscpp smclib cmake_modules)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add cmake_modules in alphabetical order.

esteve added a commit that referenced this pull request Oct 28, 2014
Use cmake_modules to find the UUID libraries.
@esteve esteve merged commit 43df790 into master Oct 28, 2014
@esteve esteve deleted the cmake-modules-uuid branch October 28, 2014 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants