Commit 7147eb52 authored by Gert Wollny's avatar Gert Wollny
Browse files

New upstream version 4.13.1-dfsg1

parent 17b6cb10

.circleci/config.yml

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ jobs: 
          command: |

            sudo apt-get install -y  rsync ninja-build ccache

            sudo pip install --upgrade pip

            sudo pip install scikit-ci-addons

            ci_addons circle/install_cmake.py 3.7.2

            sudo pip install cmake==3.7.2 scikit-ci-addons

      - run:

          name: CCache initialization

          command: |

CMake/ITKExternalData.cmake

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ if(NOT ITK_FORBID_DOWNLOADS) 
    # Data published on Girder

    "https://data.kitware.com:443/api/v1/file/hashsum/%(algo)/%(hash)/download"



    # Data published on MIDAS

    "https://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=%(hash)&algorithm=%(algo)"



    # Data published by developers using git-gerrit-push.

    "https://itk.org/files/ExternalData/%(algo)/%(hash)"

CMake/ITKModuleMacros.cmake

+11 −1
Original line number Diff line number Diff line
@@ -331,12 +331,22 @@ macro(itk_module_test) 
endmacro()



macro(itk_module_examples)

  cmake_dependent_option(Module_${itk-module}_BUILD_EXAMPLES "Build the examples" OFF "BUILD_EXAMPLES" OFF)

  set(_build_examples_default OFF)

  if(BUILD_EXAMPLES OR ITK_BUILD_EXAMPLES)

    set(_build_examples_default ON)

  endif()

  set(Module_${itk-module}_BUILD_EXAMPLES ${_build_examples_default} CACHE BOOL "Build the examples for Module_${itk-module}")

  if(Module_${itk-module}_BUILD_EXAMPLES)

    if(ITK_SOURCE_DIR)

      # If configuration is done from within ITK,

      # point to internal ITKConfig.cmake

      set(ITK_DIR ${ITK_BINARY_DIR}/CMakeTmp)

    else()

      # Ensure that executables get added to the current build tree instead of

      # ITK's build tree when building as an external module.

      if(CMAKE_RUNTIME_OUTPUT_DIRECTORY STREQUAL "${ITK_DIR}/bin")

        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)

      endif()

    endif()

    # Adds example subdirectory

    add_subdirectory( examples )

CMake/ITKModuleRemote.cmake

+3 −1
Original line number Diff line number Diff line
@@ -46,10 +46,11 @@ endfunction() 
# desired revision and only performs a fetch and checkout if needed.

function(_git_update git_executable git_repository git_tag module_dir)

  execute_process(

    COMMAND "${git_executable}" rev-parse --verify ${git_tag}

    COMMAND "${git_executable}" rev-parse --verify "${git_tag}"

    WORKING_DIRECTORY "${module_dir}"

    RESULT_VARIABLE error_code

    OUTPUT_VARIABLE tag_hash

    OUTPUT_STRIP_TRAILING_WHITESPACE

    )

  if(error_code)

    message(FATAL_ERROR "Failed to get the hash for tag '${module_dir}'")
@@ -59,6 +60,7 @@ function(_git_update git_executable git_repository git_tag module_dir) 
    WORKING_DIRECTORY "${module_dir}"

    RESULT_VARIABLE error_code

    OUTPUT_VARIABLE head_hash

    OUTPUT_STRIP_TRAILING_WHITESPACE

    )

  if(error_code)

    message(FATAL_ERROR "Failed to get the hash for ${git_repository} HEAD")

CMake/itkExternal_FFTW.cmake

+4 −4
Original line number Diff line number Diff line
@@ -82,15 +82,15 @@ else() 
    endif()



    set(_fftw_target_version 3.3.4)

    set(_fftw_url_md5 "2edab8c06b24feeb3b82bbb3ebf3e7b3")

    set(_fftw_url "https://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=${_fftw_url_md5}&name=fftw-${_fftw_target_version}.tar.gz")

    set(_fftw_url_hash "1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1")

    set(_fftw_url "https://data.kitware.com/api/v1/file/hashsum/sha512/${_fftw_url_hash}/download")



    if(ITK_USE_FFTWF)

      itk_download_attempt_check(FFTW)

      ExternalProject_add(fftwf

        PREFIX fftwf

        URL "${_fftw_url}"

        URL_MD5 "${_fftw_url_md5}"

        URL_HASH SHA512="${_fftw_url_hash}"

        DOWNLOAD_NAME "fftw-${_fftw_target_version}.tar.gz"

        CONFIGURE_COMMAND

          env
@@ -118,7 +118,7 @@ else() 
      ExternalProject_add(fftwd

        PREFIX fftwd

        URL "${_fftw_url}"

        URL_MD5 "${_fftw_url_md5}"

        URL_HASH SHA512="${_fftw_url_hash}"

        DOWNLOAD_NAME "fftw-${_fftw_target_version}.tar.gz"

        CONFIGURE_COMMAND

          env