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.

Sign up for GitHub

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

Jump to bottom

Upgrade CMake to 3.14 #407

Merged
merged 8 commits into from
Nov 1, 2019
Merged

Upgrade CMake to 3.14 #407

merged 8 commits into from
Nov 1, 2019

Conversation

shadowwalkersb
Copy link
Member

@shadowwalkersb shadowwalkersb commented Jul 2, 2019 •
edited
Loading

  • Upgrades minimum required cmake version to 3.14 to handle newer Boost versions which will be needed for Python 3.
  • Makes use of new cmake features available in newer versions.
  • ❗️ Detects if the python interpreter is linked against libpython.so or libpython.a and sets linker flags accordingly to avoid segmentation faults.

@shadowwalkersb shadowwalkersb added this to the Python 3 milestone Jul 3, 2019
@shadowwalkersb shadowwalkersb marked this pull request as ready for review July 3, 2019 17:42
@shadowwalkersb
Copy link
Member Author

@mstabrin , if you can test this branch and the instructions, it would be nice to confirm.

@shadowwalkersb shadowwalkersb changed the base branch from refactor-cmake to master October 1, 2019 20:45
@shadowwalkersb shadowwalkersb force-pushed the cmake-upgrade branch 2 times, most recently from 9f6dad5 to a2ced75 Compare October 2, 2019 23:16
@shadowwalkersb shadowwalkersb removed the request for review from mstabrin October 3, 2019 00:16
@shadowwalkersb
Copy link
Member Author

shadowwalkersb commented Oct 3, 2019 •
edited
Loading

Added to the description an item about detecting if the python interpreter is linked against static or shared libpython. This is critical to avoid segfaults. Otherwise, this is ready to merge. After this is merged, developers will need to upgrade CMake.

cmake install eman-deps=15.1 cmake=3.14 -c cryoem -c defaults -c conda-forge

@shadowwalkersb shadowwalkersb force-pushed the cmake-upgrade branch 2 times, most recently from d38cf61 to 3d08f3c Compare October 18, 2019 00:59
@shadowwalkersb shadowwalkersb force-pushed the cmake-upgrade branch 2 times, most recently from 2cabe3f to 4dfc3f9 Compare October 24, 2019 20:02
@shadowwalkersb shadowwalkersb merged commit 80da6e4 into master Nov 1, 2019
@shadowwalkersb shadowwalkersb deleted the cmake-upgrade branch November 1, 2019 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Python 3
Development

Successfully merging this pull request may close these issues.
1 participant
@shadowwalkersb