Skip to content

Commit f8a401d

Browse files
committed
Merge branch 'master' into release
2 parents 22561c4 + 0fa5b15 commit f8a401d

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ if(ITKPythonPackage_SUPERBUILD)
7373
include(ExternalProject)
7474

7575
set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
76-
# ITK release 2019-07-24
77-
set(ITK_GIT_TAG "v5.0.1")
76+
# ITK nightly-master 2019-09-01
77+
set(ITK_GIT_TAG "d2e511437d")
7878

7979
#-----------------------------------------------------------------------------
8080
# A separate project is used to download ITK, so that it can reused

itkVersion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '5.0.1'
1+
VERSION = '5.0.1.dev20190901+355.gd2e511437d'
22

33
def get_versions():
44
"""Returns versions for the ITK Python package.

scripts/macpython-download-cache-and-build-module-wheels.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
brew update
77
brew install zstd aria2 gnu-tar doxygen
88
brew upgrade cmake
9+
# The Azure systems current do not have the 10.13 SDK, required by the
10+
# ITKPythonBuilds
11+
SDK_PATH='/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk'
12+
if test ! -e $SDK_PATH; then
13+
sudo ln -s /Applications/Xcode_9.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
14+
fi
915
aria2c -c --file-allocation=none -o ITKPythonBuilds-macosx.tar.zst -s 10 -x 10 https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0.1}/ITKPythonBuilds-macosx.tar.zst
1016
unzstd ITKPythonBuilds-macosx.tar.zst -o ITKPythonBuilds-macosx.tar
1117
PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"

0 commit comments

Comments
 (0)