Merge pull request #74 from thewtex/windows-ci

ENH: Add Windows build configuration to Azure Pipelines

Author: thewtex

Superbuild/External-ITK.cmake

@@ -2,8 +2,8 @@
 # Get and build itk
 
 if(NOT ITK_TAG)
-  # 2018-09-26
-  set(ITK_TAG "b784f6355a88650f13345025ece292dd60a0d98c")
+  # 2018-09-27
+  set(ITK_TAG "5e61c289a677a74bffa4c113bf991a18f4b98495")
 endif()
 
 set(_vtk_args)
@@ -47,6 +47,14 @@ if(APPLE)
     "-DBUILD_SHARED_LIBS:BOOL=ON"
     )
 endif()
+set(_windows_args)
+set(_zlib_deps zlib)
+if(WIN32)
+  set(_windows_args
+    "-DITK_USE_SYSTEM_ZLIB:BOOL=OFF"
+    )
+  set(_zlib_deps )
+endif()
 
 ExternalProject_Add(ITK
   GIT_REPOSITORY "${git_protocol}://github.com/InsightSoftwareConsortium/ITK.git"
@@ -71,8 +79,9 @@ ExternalProject_Add(ITK
     ${_opencv_args}
     ${_wrap_python_args}
     ${_apple_args}
+    ${_windows_args}
   INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "ITK install skipped"
-  DEPENDS ${ITK_DEPENDENCIES} ${_python_depends} zlib
+  DEPENDS ${ITK_DEPENDENCIES} ${_python_depends} ${_zlib_deps}
   LOG_BUILD 0
 )
 

Superbuild/External-zlib.cmake

@@ -9,9 +9,7 @@ ExternalProject_Add(zlib
   BINARY_DIR zlib-build
   INSTALL_DIR zlib-install
   CMAKE_CACHE_ARGS
-    ## CXX should not be needed, but it a cmake default test
-    -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-    -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+    ${ep_common_args}
     -DZLIB_MANGLE_PREFIX:STRING=itkexamples_zlib_
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   )

Superbuild/Superbuild.cmake

@@ -31,8 +31,10 @@ endif()
 set(ITKExamples_DEPENDENCIES )
 set(ITK_DEPENDENCIES )
 
-# Used by ITK, VTK, and Python -- always build it.
-include(${CMAKE_SOURCE_DIR}/External-zlib.cmake)
+# Used by ITK, VTK, -- always build it.
+if(NOT WIN32 OR ITKExamples_USE_VTK AND NOT VTK_DIR)
+  include(${CMAKE_SOURCE_DIR}/External-zlib.cmake)
+endif()
 
 option(ITKExamples_USE_OpenCV "Add OpenCV to the superbuild" OFF)
 if(NOT OpenCV_DIR AND ITKExamples_USE_OpenCV)

Utilities/Testing/azure-pipelines.yml

@@ -13,7 +13,7 @@ jobs:
         git submodule update --init --recursive
         popd
 
-        git clone -b dashboard --single-branch https://github.com/thewtex/ITKExamples.git ITKExamples-dashboard
+        git clone -b dashboard --single-branch https://github.com/InsightSoftwareConsortium/ITKExamples.git ITKExamples-dashboard
 
         sudo pip3 install ninja
         sudo apt-get install -y python3-venv
@@ -39,7 +39,7 @@ jobs:
         git submodule update --init --recursive
         popd
 
-        git clone -b dashboard --single-branch https://github.com/thewtex/ITKExamples.git ITKExamples-dashboard
+        git clone -b dashboard --single-branch https://github.com/InsightSoftwareConsortium/ITKExamples.git ITKExamples-dashboard
 
         sudo pip3 install ninja
 
@@ -49,3 +49,23 @@ jobs:
         ctest -S ITKExamples-dashboard/azure_dashboard.cmake -VV -j 4
       displayName: Build and Test
       workingDirectory: $(Agent.BuildDirectory)
+
+- job: Windows
+  timeoutInMinutes: 0
+  cancelTimeoutInMinutes: 60
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+    - script: |
+        git clone -b dashboard --single-branch https://github.com/InsightSoftwareConsortium/ITKExamples.git ITKExamples-dashboard
+
+        pip3 install ninja
+
+        cmake --version
+
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        set CC=cl.exe
+        set CXX=cl.exe
+        ctest -S ITKExamples-dashboard/azure_dashboard.cmake -VV -j 4
+      displayName: Build and Test
+      workingDirectory: $(Agent.BuildDirectory)