-
Notifications
You must be signed in to change notification settings - Fork 152
Fix py27 vs2015 build and add patch mgmt #188
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
Fix py27 vs2015 build and add patch mgmt #188
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After a quick glance, I didn't spot anything out of the ordinary. Thanks for working on this @jcfr !
README.rst
Outdated
@@ -61,6 +61,12 @@ options on the commandline with `-DOPTION=VALUE`, or use the "ccmake" gui. | |||
PYTHON_VERSION=major.minor.patch (defaults to 3.5.2) | |||
The version of Python to build. | |||
|
|||
PYTHON_APPLY_PATCHES=ON|OFF (defaults to OFF) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will fix this. Default is ON
@dzenanz @adamrankin Thanks to your outstanding investigative work, we were able to put together a collection of patches. These patches are directly managed by |
Thanks: Adam Rankin <arankin@robarts.ca> Thanks: Dzenan Zukic <dzenan.zukic@kitware.com> Thanks: Franklin King <franklin.king@queensu.ca>
14b8e1a
to
18176d6
Compare
Cc: @msmolens |
Merging. VS2013 and VS2015 builds are successful, all linux build are successful, only osx is lagging behind. |
option(PYTHON_APPLY_PATCHES "Apply patches" ON) | ||
if(PYTHON_APPLY_PATCHES) | ||
include(cmake/PythonApplyPatches.cmake) | ||
endif() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because PythonApplyPatches.cmake
uses PY_VERSION
, this block should come after the block below that extracts the version from the source.
No description provided.