COMP: Synchronize with template builder scripts.

Author: hjmjohnson

CMakeLists.txt

@@ -1,10 +1,14 @@
 cmake_minimum_required(VERSION 3.10.2)
 project(TwoProjectionRegistration)
 
+# Header only libraries do not use 
+set(TwoProjectionRegistration_LIBRARIES "")
+
 if(NOT ITK_SOURCE_DIR)
-  find_package(ITK 5.0 REQUIRED)
+  find_package(ITK 5.1 REQUIRED)
   list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
   include(ITKModuleExternal)
 else()
+  set(ITK_DIR ${CMAKE_BINARY_DIR})
   itk_module_impl()
 endif()

README.rst

@@ -1,10 +1,17 @@
-ITKTwoProjectionRegistration
-============================
+TwoProjectionRegistration
+=================================
 
 .. image:: https://dev.azure.com/InsightSoftwareConsortium/ITKModules/_apis/build/status/InsightSoftwareConsortium.ITKTwoProjectionRegistration?branchName=master
     :target: https://dev.azure.com/InsightSoftwareConsortium/ITKModules/_build/latest?definitionId=13&branchName=master
     :alt: Build Status
 
+.. image:: https://img.shields.io/pypi/v/itk-twoprojectregistration.svg
+    :target: https://pypi.python.org/pypi/itk-twoprojectregistration
+    :alt: PyPI Version
+
+.. image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg
+    :target: https://github.com/InsightSoftwareConsortium/TwoProjectionRegistration/blob/master/LICENSE)
+    :alt: License
 
 Overview
 --------

itk-module.cmake

@@ -1,12 +1,14 @@
 # the top-level README is used for describing this module, just
 # re-used it for documentation here
-get_filename_component(MY_CURENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(READ "${MY_CURENT_DIR}/README.rst" DOCUMENTATION)
+get_filename_component(MY_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+file(READ "${MY_CURRENT_DIR}/README.rst" DOCUMENTATION)
 
 # itk_module() defines the module dependencies in TwoProjectionRegistration
+# TwoProjectionRegistration depends on ITKCommon
 # The testing module in TwoProjectionRegistration depends on ITKTestKernel
+# and ITKMetaIO(besides TwoProjectionRegistration and ITKCore)
 # By convention those modules outside of ITK are not prefixed with
-# ITK
+# ITK.
 
 # define the dependencies of the include module and the tests
 itk_module(TwoProjectionRegistration
@@ -22,5 +24,5 @@ itk_module(TwoProjectionRegistration
   DESCRIPTION
     "${DOCUMENTATION}"
   EXCLUDE_FROM_DEFAULT
-  ENABLE_SHARED
+  # Header only libraries do not use ENABLE_SHARED
 )

test/azure-pipelines.yml

@@ -55,12 +55,13 @@ jobs:
       python -m pip install --upgrade pip
       python -m pip install --upgrade setuptools
       python -m pip install scikit-ci-addons
-      python -m pip install cookiecutter
       python -m pip install ninja
     displayName: 'Install build dependencies'
 
   - script: |
       git clone --depth 5 --branch $(ITKGitTag) https://github.com/InsightSoftwareConsortium/ITK.git
+      cd ITK
+      git checkout $(ITKGitTag)
     workingDirectory: $(Agent.BuildDirectory)
     displayName: 'Download ITK'
 
@@ -77,16 +78,11 @@ jobs:
       curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITK/dashboard/itk_common.cmake -O
     displayName: 'Fetch CTest driver script'
 
-  - bash: |
-      python -m cookiecutter --no-input --output-dir "$(Agent.BuildDirectory)" "$(Build.SourcesDirectory)"
-      mkdir "$(Agent.BuildDirectory)/ITKModuleTemplate/.git"
-    displayName: 'Evaluate template'
-
   - bash: |
       cat > dashboard.cmake << EOF
       set(CTEST_SITE "Azure.\$ENV{AGENT_MACHINENAME}")
       file(TO_CMAKE_PATH "\$ENV{AGENT_BUILDDIRECTORY}" CTEST_DASHBOARD_ROOT)
-      file(TO_CMAKE_PATH "\$ENV{AGENT_BUILDDIRECTORY}/ITKModuleTemplate" CTEST_SOURCE_DIRECTORY)
+      file(TO_CMAKE_PATH "\$ENV{BUILD_SOURCESDIRECTORY}" CTEST_SOURCE_DIRECTORY)
       file(TO_CMAKE_PATH "\$ENV{AGENT_BUILDDIRECTORY}/build" CTEST_BINARY_DIRECTORY)
       set(dashboard_source_name "$(Build.Repository.Name)")
       if(DEFINED ENV{SYSTEM_PULLREQUEST_SOURCEBRANCH})
@@ -138,7 +134,7 @@ jobs:
       sudo pip3 install --upgrade pip
       sudo pip3 install --upgrade setuptools
       sudo pip3 install scikit-ci-addons
-      ci_addons ctest_junit_formatter "$(Agent.BuildDirectory)/build" > "$(Agent.BuildDirectory)/JUnitTestResults.xml"
+      ci_addons ctest_junit_formatter $(Agent.BuildDirectory)/build > $(Agent.BuildDirectory)/JUnitTestResults.xml
     condition: succeededOrFailed()
     displayName: 'Format CTest output in JUnit format'
 
@@ -169,20 +165,14 @@ jobs:
       architecture: 'x64'
 
   - script: |
-      python -m pip install cookiecutter
-      python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
-    displayName: 'Evaluate template'
-
-  - script: |
-      cd $(Agent.BuildDirectory)/ITKModuleTemplate
       export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
-      $(Build.SourcesDirectory)/dockcross-manylinux-download-cache-and-build-module-wheels.sh
+      ./dockcross-manylinux-download-cache-and-build-module-wheels.sh
     displayName: 'Build Python packages'
 
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'LinuxWheels'
-      targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
+      targetPath: './dist'
 
 
 - job: 'PackageMacOS'
@@ -199,20 +189,14 @@ jobs:
     displayName: 'Fetch build script'
 
   - script: |
-      python -m pip install cookiecutter
-      python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
-    displayName: 'Evaluate template'
-
-  - script: |
-      cd $(Agent.BuildDirectory)/ITKModuleTemplate
       export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
-      $(Build.SourcesDirectory)/macpython-download-cache-and-build-module-wheels.sh
+      ./macpython-download-cache-and-build-module-wheels.sh
     displayName: 'Build Python packages'
 
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'MacOSWheels'
-      targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
+      targetPath: './dist'
 
 
 - job: 'PackageWindows'
@@ -227,21 +211,15 @@ jobs:
       curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
     displayName: 'Fetch build script'
 
-  - script: |
-      python -m pip install cookiecutter
-      python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
-    displayName: 'Evaluate template'
-
   - script: |
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      cd $(Agent.BuildDirectory)\ITKModuleTemplate
       set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
       set CC=cl.exe
       set CXX=cl.exe
-      powershell.exe -file $(Build.SourcesDirectory)\windows-download-cache-and-build-module-wheels.ps1
+      powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1
     displayName: 'Build Python packages'
 
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'WindowsWheels'
-      targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
+      targetPath: './dist'

wrapping/CMakeLists.txt

@@ -8,4 +8,3 @@ set(WRAPPER_SUBMODULE_ORDER
 
 itk_auto_load_submodules()
 itk_end_wrap_module()
-