Skip to content

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

Conversation

jcfr
Copy link
Contributor

@jcfr jcfr commented Aug 1, 2017

No description provided.

Copy link

@dzenanz dzenanz left a 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)
Copy link
Contributor Author

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

@jcfr
Copy link
Contributor Author

jcfr commented Aug 1, 2017

@dzenanz @adamrankin Thanks to your outstanding investigative work, we were able to put together a collection of patches.

These patches are directly managed by python-cmake-buildsystem. This means we will not have to explicitly patch Python sources from within Slicer.

Thanks: Adam Rankin <arankin@robarts.ca>
Thanks: Dzenan Zukic <dzenan.zukic@kitware.com>
Thanks: Franklin King <franklin.king@queensu.ca>
@jcfr jcfr force-pushed the fix-py27-vs2015-build-and-add-patch-mgmt branch from 14b8e1a to 18176d6 Compare August 1, 2017 21:39
@jcfr
Copy link
Contributor Author

jcfr commented Aug 1, 2017

Cc: @msmolens

jcfr referenced this pull request in Tech-XCorp/pythoncm Aug 1, 2017
@jcfr
Copy link
Contributor Author

jcfr commented Aug 1, 2017

Merging. VS2013 and VS2015 builds are successful, all linux build are successful, only osx is lagging behind.

@jcfr jcfr merged commit 03616b1 into python-cmake-buildsystem:master Aug 1, 2017
@jcfr jcfr deleted the fix-py27-vs2015-build-and-add-patch-mgmt branch August 1, 2017 22:09
option(PYTHON_APPLY_PATCHES "Apply patches" ON)
if(PYTHON_APPLY_PATCHES)
include(cmake/PythonApplyPatches.cmake)
endif()
Copy link
Contributor

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.

jwcotejr added a commit to nirai-compiler/python that referenced this pull request Jul 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants