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 build when using system boost #1896

Merged
merged 1 commit into from
Mar 17, 2016
Merged

Conversation

danstowell
Copy link
Member

Found this while packaging for debian. Fixes a small bug that prevents build if cmake boost is found.

@crucialfelix
Copy link
Member

Don't merge this yet !

I will make the PR with the merge to master first.
Then we can keep 3.7 branch o_pen but only for critical bug fixes._
Lets try to not make an endless series of point releases with small bugs
and changes.
Rather we should work towards a 3.8 that isn't so epic.
Do we all agree on that strategy ?

*Though I *suppose you can't create a Debian package for 3.7.0 without this.
Right ?

We could move the tag if that's the case.

Ignore the underlines in the text. It's just my iPad being sloppy.

On Wednesday, March 16, 2016, danstowell notifications@github.com wrote:

Found this while packaging for debian. Fixes a small bug that prevents

build if cmake boost is found.

You can view, comment on, or merge this pull request online at:

#1896
Commit Summary

  • cmake: fix build when using system boost

File Changes

Patch Links:


You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub
#1896

@danstowell
Copy link
Member Author

This fix should go to both 3.7 and to master IMO. For packaging 3.7.0 debian the fix is absolutely needed so I have applied it as a downstream patch, and the official standard way to go forward would be to upstream the patch into 3.7.1 (i.e. this PR).

For me, as long as the fix makes it into the 3.7 branch eventually and not master only, I don't really mind how it's managed. (Don't move the tag though, that's not good.)

@crucialfelix
Copy link
Member

okay, first I will do the PR for merging 3.7.0 into master.

then merge this into 3.7 branch

and it comes out in 3.7.1 which is in 2 or 3 weeks. at that point its merged also into master.

@crucialfelix crucialfelix added this to the 3.7.1 milestone Mar 16, 2016
@danstowell
Copy link
Member Author

OK, thanks for being careful

@crucialfelix
Copy link
Member

3.7 merge is here: #1898

crucialfelix added a commit that referenced this pull request Mar 17, 2016
cmake: fix build when using system boost
@crucialfelix crucialfelix merged commit 187341a into 3.7 Mar 17, 2016
@mossheim mossheim deleted the cmake-fix-systemboost branch January 15, 2017 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp: build CMake build system os: Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants