Use C++14, unpin boost, and update prebuilt CCTBX base #2319
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
|
I'd say this closes #2291 |
|
Yes, however it seems the windows issues have hit this one too. Ideally I'd like to solve them before making the new release. |
|
Cancelled because this won't work until cctbx/dxtbx#605 is in |
This is explicitly linked by dxtbx, but until now had only been implicitly pulled in as a dependency. At least some configurations of packages on windows apparently doesn't do this any more, so let's be explicit.
dagewa
pushed a commit
that referenced
this pull request
Feb 20, 2023
Using C++14 by default exposes dials to failures on windows because of the standard library overrides in cctbx, so remove those when building dials libraries. Using C++14 means that we can use Boost::Geometry in boost 1.78, which dropped support for older versions. This means that we can build against the January 2023 release of cctbx, which requires boost 1.78. Additionally, dxtbx directly links to zlib but this was only ever pulled into the conda environments implicitly, but on some configurations of building dials on windows this is no longer the case - so make the dependency explicit here. Fixes #2291.
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.
Now that we can enable C++14 in the libtbx environment, enable this. This lets us unpin boost so that we can use boost::geometry in boost 1.78 (which only supports C++14).
Prebuilt pointer is updated here but currently doesn't work; The distributed libtbx environment is built against boost 1.78 but fixed to C++11, and it doesn't seem immediately easy to override. I'm not current sure how extensively we are actually using that mode now though; I think in most cases we now use CMake (which always supported C++14).