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: Fix for CppUnit and C++11 on master #1425

Merged
merged 2 commits into from
Sep 21, 2017

Conversation

michaelld
Copy link
Contributor

If CppUnit version >= 1.14.0, try to switch to C++11. Otherwise, use C++98 as before. Requires that FindCppUnit return the CppUnit version if found.

Same same as #1424 except on master instead of maint.

If CppUnit version >= 1.14.0, try to switch to C++11. Otherwise, use C++98 as before. Requires that FindCppUnit return the CppUnit version if found.
@jmcorgan
Copy link
Contributor

See my comments on #1424. You can force push the master branch created that way to this PR.

If CppUnit version >= 1.14.0, try to switch to C++11. Otherwise, use C++98 as before. Requires that FindCppUnit return the CppUnit version if found.
@michaelld
Copy link
Contributor Author

OK. I think this PR is correct for what you wanted: maint -> master, with fixups after the merge.

This was referenced Aug 16, 2017
@jmcorgan jmcorgan modified the milestones: Release 3.7.11.1, Release 3.7.12 Aug 16, 2017
@jmcorgan jmcorgan merged commit e286742 into gnuradio:master Sep 21, 2017
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.

None yet

2 participants