cmake: fix boost build on ubuntu 16.10 yakkety #12143
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If the host system has boost version 1.61 or higher (as in the case for ubuntu 16.10 yakkety) the ceph build is currently broken. it will pickup the system boost libraries but use the headers from the submodule. This commit ensure that when WITH_SYSTEM_BOOST is OFF we always use the boost libraries and headers built from the submodule. Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
cbodley
reviewed
Nov 22, 2016
| @@ -460,7 +463,7 @@ if(WITH_MGR) | |||
| endif() | |||
|
|
|||
| # require minimally the bundled version | |||
| find_package(Boost 1.61 COMPONENTS thread system regex random program_options date_time iostreams REQUIRED) | |||
| find_package(Boost 1.61 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) | |||
There was a problem hiding this comment.
where is BOOST_COMPONENTS coming from? this list should be the minimal set of components that ceph actually relies on
There was a problem hiding this comment.
it comes from a few lines above 3eef10b#diff-af3b638bc2a3e6c650974192a53c7291R459. It was there but never used. I assume the intention was to pass it to find_package so I went ahead and did that. Its unrelated to this PR however.
There was a problem hiding this comment.
Yes, I introduced BOOST_COMPONENTS for that purpose, but lost track of it debugging builds. If it works correctly, it's slightly cleaner.
mattbenjamin
approved these changes
Nov 22, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the host system has boost version 1.61 or higher (as in the case
for ubuntu 16.10 yakkety) the ceph build is currently broken. it
will pickup the system boost libraries but use the headers from the
submodule.
This commit ensure that when WITH_SYSTEM_BOOST is OFF we always
use the boost libraries and headers built from the submodule.
Signed-off-by: Bassam Tabbara bassam.tabbara@quantum.com