Commit a82926d1 authored by Gert Wollny's avatar Gert Wollny
Browse files

New upstream version 4.13.2-dfsg1

parent 7147eb52

CMake/CTestCustom.cmake.in

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ if(APPLE) 
    ${CTEST_CUSTOM_WARNING_EXCEPTION}

    "warning -.: directory name .* does not exist"

    "ld.*warning.*duplicate dylib.*"

    "ld: warning: text-based stub file /System/Library/Frameworks/.*Falling back to library file for linking."

    )

endif()

CMake/ITKModuleEnablement.cmake

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,8 @@ foreach(itk-module ${ITK_MODULES_ENABLED}) 
    init_module_vars()

  endif()

  include("${${itk-module}_SOURCE_DIR}/itk-module-init.cmake" OPTIONAL)

  # Set CMP0048 to new in all modules

  set(CMAKE_POLICY_DEFAULT_CMP0048 "NEW")

  add_subdirectory("${${itk-module}_SOURCE_DIR}" "${${itk-module}_BINARY_DIR}")

endforeach()

CMake/ITKSetStandardCompilerFlags.cmake

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 


include(ITK_CheckCCompilerFlag)

include(ITK_CheckCXXCompilerFlag)

if(NOT CMAKE_VERSION VERSION_LESS 3.14.0)

  include(CheckPIESupported)

  check_pie_supported()

endif()



function(check_c_compiler_warning_flags c_flag_var)

  set(local_c_flags "")

CMake/itkExternal_FFTW.cmake

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ else() 
      ExternalProject_add(fftwf

        PREFIX fftwf

        URL "${_fftw_url}"

        URL_HASH SHA512="${_fftw_url_hash}"

        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_HASH SHA512="${_fftw_url_hash}"

        URL_HASH SHA512=${_fftw_url_hash}

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

        CONFIGURE_COMMAND

          env

CMakeLists.txt

+2 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ foreach(p 
    CMP0056 # CMake 3.2

    CMP0058 # CMake 3.3

    CMP0063 # CMake 3.3.2

    CMP0083 # CMake 3.14.0

    )

  if(POLICY ${p})

    cmake_policy(SET ${p} NEW)
@@ -22,7 +23,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH}) 
# ITK version number components.

set(ITK_VERSION_MAJOR "4")

set(ITK_VERSION_MINOR "13")

set(ITK_VERSION_PATCH "1")

set(ITK_VERSION_PATCH "2")

set(ITK_VERSION

    "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")

project(ITK
@@ -98,10 +99,6 @@ include(itkCheckSourceTree) 
set(main_project_name ${_ITKModuleMacros_DEFAULT_LABEL})



#-----------------------------------------------------------------------------

# ITK version number.

set(ITK_VERSION_MAJOR "4")

set(ITK_VERSION_MINOR "13")

set(ITK_VERSION_PATCH "0")

configure_file(CMake/ITKConfigVersion.cmake.in ITKConfigVersion.cmake @ONLY)



if(NOT ITK_INSTALL_RUNTIME_DIR)