Skip to content

Commit 9a9f449

Browse files
authored
Merge pull request #64 from thewtex/build-with-itk-5
ENH: Build against ITK 5.0.0.post1
2 parents 1621df0 + 2bf8815 commit 9a9f449

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

azure-pipelines.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
variables:
2-
ITKGitTag: v5.0rc01
3-
CMakeBuildType: MinSizeRel
2+
ITKGitTag: v5.0.0
3+
ITKPythonPost: '.post1'
4+
CMakeBuildType: Release
45

56
trigger:
67
batch: true
@@ -173,6 +174,7 @@ jobs:
173174
174175
- script: |
175176
cd $(Agent.BuildDirectory)/ITKModuleTemplate
177+
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
176178
export ITK_PACKAGE_VERSION=$(ITKGitTag)
177179
$(Build.SourcesDirectory)/dockcross-manylinux-download-cache-and-build-module-wheels.sh
178180
displayName: 'Build Python packages'
@@ -188,7 +190,7 @@ jobs:
188190
timeoutInMinutes: 0
189191
cancelTimeoutInMinutes: 300
190192
pool:
191-
vmImage: 'macos-10.13'
193+
vmImage: 'macos-10.14'
192194

193195
steps:
194196
- script: |
@@ -203,7 +205,7 @@ jobs:
203205
204206
- script: |
205207
cd $(Agent.BuildDirectory)/ITKModuleTemplate
206-
export ITK_PACKAGE_VERSION=$(ITKGitTag)
208+
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
207209
$(Build.SourcesDirectory)/macpython-download-cache-and-build-module-wheels.sh
208210
displayName: 'Build Python packages'
209211
@@ -233,7 +235,7 @@ jobs:
233235
- script: |
234236
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
235237
cd $(Agent.BuildDirectory)\ITKModuleTemplate
236-
set ITK_PACKAGE_VERSION=$(ITKGitTag)
238+
set ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
237239
set CC=cl.exe
238240
set CXX=cl.exe
239241
powershell.exe -file $(Build.SourcesDirectory)\windows-download-cache-and-build-module-wheels.ps1

{{cookiecutter.project_name}}/test/azure-pipelines.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
variables:
2-
ITKGitTag: v5.0rc01
2+
ITKGitTag: v5.0.0
3+
ITKPythonPost: '.post1'
34
CMakeBuildType: Release
45

56
trigger:
@@ -156,7 +157,7 @@ jobs:
156157
displayName: 'Fetch build script'
157158
158159
- script: |
159-
export ITK_PACKAGE_VERSION=$(ITKGitTag)
160+
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
160161
./dockcross-manylinux-download-cache-and-build-module-wheels.sh
161162
displayName: 'Build Python packages'
162163
@@ -171,7 +172,7 @@ jobs:
171172
timeoutInMinutes: 0
172173
cancelTimeoutInMinutes: 300
173174
pool:
174-
vmImage: 'macos-10.13'
175+
vmImage: 'macos-10.14'
175176

176177
steps:
177178
- script: |
@@ -180,7 +181,7 @@ jobs:
180181
displayName: 'Fetch build script'
181182
182183
- script: |
183-
export ITK_PACKAGE_VERSION=$(ITKGitTag)
184+
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
184185
./macpython-download-cache-and-build-module-wheels.sh
185186
displayName: 'Build Python packages'
186187
@@ -204,7 +205,7 @@ jobs:
204205
205206
- script: |
206207
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
207-
set ITK_PACKAGE_VERSION=$(ITKGitTag)
208+
set ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
208209
set CC=cl.exe
209210
set CXX=cl.exe
210211
powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1

0 commit comments

Comments
 (0)