Skip to content

Commit 09bbfe6

Browse files
committed
COMP: Disable wrapping enable examples.
Disable python packaging that is not working. Enable the example code base when requested
1 parent d68b2e5 commit 09bbfe6

File tree

10 files changed

+103
-100
lines changed

10 files changed

+103
-100
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ project(AnalyzeObjectMapIO
77
set(AnalyzeObjectMapIO_LIBRARIES AnalyzeObjectMapIO)
88

99
if(NOT ITK_SOURCE_DIR)
10-
find_package(ITK REQUIRED)
10+
find_package(ITK 5.1 REQUIRED)
1111
list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
1212
include(ITKModuleExternal)
1313
else()
1414
set(ITK_DIR ${CMAKE_BINARY_DIR})
1515
itk_module_impl()
1616
endif()
17+
18+
itk_module_examples()

Examples/CMakeLists.txt renamed to examples/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.10.2)
22

33
project(AnalyzeObjectMapExamples)
44

5-
find_package(ITK REQUIRED)
5+
find_package(ITK 5.1 REQUIRED)
66
if(ITK_FOUND)
7-
include(${ITK_USE_FILE})
7+
include(${ITK_USE_FILE})
88
endif()
99

1010
#find_package( VTK REQUIRED )
1111
#if( VTK_FOUND )
12-
# include( ${USE_VTK_FILE} )
12+
# include( ${USE_VTK_FILE} )
1313
#endif()
1414

1515

@@ -22,12 +22,12 @@ set(TESTING_OUTPUT_DIR ${AnalyzeObjectMapExamples_BINARY_DIR}/Temporary)
2222
include_directories( ${AnalyzeObjectMapExamples_SOURCE_DIR} )
2323

2424
add_executable( CreatingObjects CreatingObjects.cxx )
25-
target_link_libraries( CreatingObjects ${ITK_LIBRARIES} AnalyzeObjectMapIO AnalyzeObjectMap)
25+
target_link_libraries( CreatingObjects ${AnalyzeObjectMapIO_LIBRARIES} ${ITK_LIBRARIES})
2626

2727
add_executable( DisplayingObjectMaps DisplayingObjectMaps.cxx )
28-
target_link_libraries( DisplayingObjectMaps ${ITK_LIBRARIES} AnalyzeObjectMapIO AnalyzeObjectMap) #vtkRendering vtkImaging vtkIO vtkCommon)
28+
target_link_libraries( DisplayingObjectMaps ${AnalyzeObjectMapIO_LIBRARIES} ${ITK_LIBRARIES})
2929

3030
add_executable( PickOneObjectEntry PickOneObjectEntry.cxx )
31-
target_link_libraries( PickOneObjectEntry ${ITK_LIBRARIES} AnalyzeObjectMapIO AnalyzeObjectMap)
31+
target_link_libraries( PickOneObjectEntry ${AnalyzeObjectMapIO_LIBRARIES} ${ITK_LIBRARIES})
3232

3333

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

itk-module.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ itk_module(AnalyzeObjectMapIO
1616
DESCRIPTION
1717
"${DOCUMENTATION}"
1818
EXCLUDE_FROM_DEFAULT
19-
ENABLE_SHARED
19+
# ENABLE_SHARED
2020
)

test/azure-pipelines.yml

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The file template originates from the instructions: https://github.com/InsightSoftwareConsortium/ITKModuleTemplate/README.md
22
variables:
3-
ITKGitTag: v5.1rc02 #Used for choosing branch of ITK to checkout
4-
ITKPythonGitTag: v20200228 #Used to identify the release name for the cached python build environmeent ITKPythonBuilds-linux.tar.zst
3+
ITKGitTag: v5.1rc02 #Used for choosing branch of ITK to checkout
4+
ITKPythonGitTag: v5.1rc02 #Used to identify the release name for the cached python build environmeent ITKPythonBuilds-linux.tar.zst
55
CMakeBuildType: Release
66

77
trigger:
@@ -19,11 +19,11 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
Linux1604:
23-
imageName: 'ubuntu-16.04'
24-
cCompiler: gcc
25-
cxxCompiler: g++
26-
compilerInitialization: ''
22+
# Linux1604:
23+
# imageName: 'ubuntu-16.04'
24+
# cCompiler: gcc
25+
# cxxCompiler: g++
26+
# compilerInitialization: ''
2727
Linux1804:
2828
imageName: 'ubuntu-18.04'
2929
cCompiler: gcc
@@ -34,16 +34,16 @@ jobs:
3434
cCompiler: clang
3535
cxxCompiler: clang++
3636
compilerInitialization: ''
37-
macOS1014:
38-
imageName: 'macos-10.14'
39-
cCompiler: clang
40-
cxxCompiler: clang++
41-
compilerInitialization: ''
42-
Windows2017:
43-
imageName: 'vs2017-win2016'
44-
cCompiler: cl.exe
45-
cxxCompiler: cl.exe
46-
compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
37+
# macOS1014:
38+
# imageName: 'macos-10.14'
39+
# cCompiler: clang
40+
# cxxCompiler: clang++
41+
# compilerInitialization: ''
42+
# Windows2017:
43+
# imageName: 'vs2017-win2016'
44+
# cCompiler: cl.exe
45+
# cxxCompiler: cl.exe
46+
# compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
4747
Windows2019:
4848
imageName: 'windows-2019'
4949
cCompiler: cl.exe
@@ -162,75 +162,75 @@ jobs:
162162
displayName: 'Publish test results'
163163

164164

165-
- job: 'PackageLinux'
166-
timeoutInMinutes: 0
167-
cancelTimeoutInMinutes: 300
168-
displayName: "Build Linux Python packages"
169-
pool:
170-
vmImage: 'Ubuntu-16.04'
171-
172-
steps:
173-
- script: |
174-
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
175-
chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh
176-
displayName: 'Fetch build script'
177-
178-
- script: |
179-
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
180-
./dockcross-manylinux-download-cache-and-build-module-wheels.sh
181-
displayName: 'Build Python packages'
182-
183-
- task: PublishPipelineArtifact@0
184-
inputs:
185-
artifactName: 'LinuxWheels'
186-
targetPath: './dist'
187-
188-
189-
- job: 'PackageMacOS'
190-
displayName: "Build macOS Python packages"
191-
timeoutInMinutes: 0
192-
cancelTimeoutInMinutes: 300
193-
pool:
194-
vmImage: 'macos-10.14'
195-
196-
steps:
197-
- script: |
198-
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
199-
chmod u+x macpython-download-cache-and-build-module-wheels.sh
200-
displayName: 'Fetch build script'
201-
202-
- script: |
203-
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
204-
./macpython-download-cache-and-build-module-wheels.sh
205-
displayName: 'Build Python packages'
206-
207-
- task: PublishPipelineArtifact@0
208-
inputs:
209-
artifactName: 'MacOSWheels'
210-
targetPath: './dist'
211-
212-
213-
- job: 'PackageWindows'
214-
displayName: "Build Windows Python packages"
215-
timeoutInMinutes: 0
216-
cancelTimeoutInMinutes: 300
217-
pool:
218-
vmImage: 'vs2017-win2016'
219-
220-
steps:
221-
- script: |
222-
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
223-
displayName: 'Fetch build script'
224-
225-
- script: |
226-
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
227-
set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
228-
set CC=cl.exe
229-
set CXX=cl.exe
230-
powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1
231-
displayName: 'Build Python packages'
232-
233-
- task: PublishPipelineArtifact@0
234-
inputs:
235-
artifactName: 'WindowsWheels'
236-
targetPath: './dist'
165+
# - job: 'PackageLinux'
166+
# timeoutInMinutes: 0
167+
# cancelTimeoutInMinutes: 300
168+
# displayName: "Build Linux Python packages"
169+
# pool:
170+
# vmImage: 'Ubuntu-16.04'
171+
#
172+
# steps:
173+
# - script: |
174+
# curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
175+
# chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh
176+
# displayName: 'Fetch build script'
177+
#
178+
# - script: |
179+
# export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
180+
# ./dockcross-manylinux-download-cache-and-build-module-wheels.sh
181+
# displayName: 'Build Python packages'
182+
#
183+
# - task: PublishPipelineArtifact@0
184+
# inputs:
185+
# artifactName: 'LinuxWheels'
186+
# targetPath: './dist'
187+
#
188+
#
189+
# - job: 'PackageMacOS'
190+
# displayName: "Build macOS Python packages"
191+
# timeoutInMinutes: 0
192+
# cancelTimeoutInMinutes: 300
193+
# pool:
194+
# vmImage: 'macos-10.14'
195+
#
196+
# steps:
197+
# - script: |
198+
# curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
199+
# chmod u+x macpython-download-cache-and-build-module-wheels.sh
200+
# displayName: 'Fetch build script'
201+
#
202+
# - script: |
203+
# export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
204+
# ./macpython-download-cache-and-build-module-wheels.sh
205+
# displayName: 'Build Python packages'
206+
#
207+
# - task: PublishPipelineArtifact@0
208+
# inputs:
209+
# artifactName: 'MacOSWheels'
210+
# targetPath: './dist'
211+
#
212+
#
213+
# - job: 'PackageWindows'
214+
# displayName: "Build Windows Python packages"
215+
# timeoutInMinutes: 0
216+
# cancelTimeoutInMinutes: 300
217+
# pool:
218+
# vmImage: 'vs2017-win2016'
219+
#
220+
# steps:
221+
# - script: |
222+
# curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
223+
# displayName: 'Fetch build script'
224+
#
225+
# - script: |
226+
# call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
227+
# set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
228+
# set CC=cl.exe
229+
# set CXX=cl.exe
230+
# powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1
231+
# displayName: 'Build Python packages'
232+
#
233+
# - task: PublishPipelineArtifact@0
234+
# inputs:
235+
# artifactName: 'WindowsWheels'
236+
# targetPath: './dist'

wrapping/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
itk_wrap_module(AnalyzeObjectLabelMapImageIO)
2-
itk_auto_load_submodules()
3-
itk_end_wrap_module()
1+
#Disabled wrapping not functional yet
2+
#itk_wrap_module(AnalyzeObjectLabelMapImageIO)
3+
#itk_auto_load_submodules()
4+
#itk_end_wrap_module()

0 commit comments

Comments
 (0)