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 qt5 cleanup #1008

Merged
merged 3 commits into from
May 17, 2016
Merged

Conversation

rhaschke
Copy link
Contributor

Unify QT usage in cmake files for both Qt4 and Qt5 version by setting common variables once.

rhaschke added 2 commits May 14, 2016 09:05
use a common variable QT_LIBRARIES to pull in lib dependencies, both in Qt4 and Qt5
use a common variable QTVERSION
@wjwwood
Copy link
Member

wjwwood commented May 16, 2016

Thanks for the patch, I think it would a good improvement. Looks like CI is failing though, and I don't have time to address the issue at the moment, so it would be a while before I can fix it up.

@wjwwood wjwwood added this to the untargeted milestone May 16, 2016
@rhaschke
Copy link
Contributor Author

Oops. I missed one dependency. Sorry.

@wjwwood
Copy link
Member

wjwwood commented May 17, 2016

Thanks, lgtm.

@wjwwood wjwwood merged commit 94368e3 into ros-visualization:kinetic-devel May 17, 2016
@rhaschke rhaschke deleted the cmake-qt5-cleanup branch May 18, 2016 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants