Merge pull request #1553 from LuaAndC/itk-4.10.1

update itk to 4.10.1
author: Boris Nagaev <bnagaev@gmail.com> 2016-10-25 20:41:47 (GMT)
committer: GitHub <noreply@github.com> 2016-10-25 20:41:47 (GMT)
commit: 03a1860982017d098022000cec11fa30d35c0c18 (patch)
tree: 2ddda1237872962e0edf41e75f5ee7fc63cdc972 /src
parent: 2c8b747d9cf58672040ff7443d2c365dba978fa5 (diff)
parent: 55e9bbada5adf4497f01805d2b0d817183325612 (diff)
download: mxe-03a1860982017d098022000cec11fa30d35c0c18.zip
mxe-03a1860982017d098022000cec11fa30d35c0c18.tar.gz
mxe-03a1860982017d098022000cec11fa30d35c0c18.tar.bz2
3 files changed, 113 insertions, 28 deletions
diff --git a/src/itk-1-fixes.patch b/src/itk-1-fixes.patch
new file mode 100644
index 0000000..38e596c
--- /dev/null
+++ b/src/itk-1-fixes.patch
@@ -0,0 +1,111 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rashad Kanavath <rashad.kanavath@c-s.fr>
+Date: Wed, 2 Dec 2015 15:00:54 +0100
+Subject: [PATCH] fix shared build
+
+
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
+@@ -6,6 +6,8 @@ set(PACKAGE "socket++")
+ include(CheckFunctionExists)
+ CHECK_FUNCTION_EXISTS(strsignal SOCKETXX_HAVE_STRSIGNAL)
+ 
++add_definitions(-Dsocketxx_EXPORTS)
++
+ # specific
+ if(WIN32)
+ else()
+@@ -67,6 +69,8 @@ if(UNIX)
+     )
+ endif()
+ 
++set(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
++
+ add_library(${SOCKETXX_LIBRARY_NAME} ${libsocket___la_SOURCES})
+ set_target_properties (${SOCKETXX_LIBRARY_NAME}
+   PROPERTIES DEFINE_SYMBOL  "socketxx_EXPORTS" )
+@@ -105,4 +109,3 @@ if(NOT SOCKETXX_INSTALL_NO_DEVELOPMENT)
+     DESTINATION ${SOCKETXX_INSTALL_INCLUDE_DIR} COMPONENT Headers
+   )
+ endif()
+-
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Mon, 24 Oct 2016 02:01:07 +0300
+Subject: [PATCH] disable try-run
+
+It is impossible to run while cross-compiling.
+
+Fix the following error:
+
+  CMake Error at Modules/ThirdParty/VNL/src/vxl/config/cmake/config/VXLIntrospectionConfig.cmake:736 (message):
+    Compiler is required to have has_infinity.
+  Call Stack (most recent call first):
+    Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt:184 (include)
+
+diff --git a/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/VXLIntrospectionConfig.cmake b/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/VXLIntrospectionConfig.cmake
+index 1111111..2222222 100644
+--- a/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/VXLIntrospectionConfig.cmake
++++ b/Modules/ThirdParty/VNL/src/vxl/config/cmake/config/VXLIntrospectionConfig.cmake
+@@ -141,52 +141,8 @@ endmacro()
+ # and returns 0 (indicating success).
+ #
+ macro(PERFORM_CMAKE_TEST_RUN PLFM_TEST_FILE TEST)
+-  if( VXL_UPDATE_CONFIGURATION )
+-    unset( ${TEST} )
+-  endif()
+-  if(NOT DEFINED "${TEST}")
+-    # Perform test
+-    set(MACRO_CHECK_FUNCTION_DEFINITIONS
+-        "-D${TEST} ${CMAKE_REQUIRED_FLAGS}")
+-    if(CMAKE_REQUIRED_LIBRARIES)
+-      set(TEST_ADD_LIBRARIES
+-          "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+-    endif()
+-    message(STATUS "Performing Test ${TEST}")
+-
+-    try_run(${TEST} ${TEST}_COMPILED
+-            ${CMAKE_BINARY_DIR}
+-            ${PLFM_TEST_FILE}
+-            CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
+-            "${TEST_ADD_LIBRARIES}"
+-            OUTPUT_VARIABLE OUTPUT)
+-    if(${TEST}_COMPILED)
+-      if(${TEST})
+-        message(STATUS "Performing Test ${TEST} - Failed")
+-        set(${TEST} 0 CACHE INTERNAL "Test ${FUNCTION} (failed to run)")
+-        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+-                   "Performing Test ${TEST} failed with the following output:\n"
+-                   "${OUTPUT}\n")
+-      else()
+-        set(${TEST} 1 CACHE INTERNAL "VXL test ${FUNCTION} (successful run)")
+-        message(STATUS "Performing Test ${TEST} - Success")
+-        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+-                   "Performing Test ${TEST} succeeded with the following output:\n"
+-                   "${OUTPUT}\n")
+-      endif()
+-    else()
+-      message(STATUS "Performing Try-Run Test ${TEST} - Test Compilation Failed")
+-      set(${TEST} 0 CACHE INTERNAL "Test ${FUNCTION} (failed to compile)")
+-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+-                 "Performing Try-Run Test ${TEST} failed to compile with the following output:\n"
+-                 "${OUTPUT}\n")
+-    endif()
+-  else()
+-    # Have result
+-    #foreach(tst ${TEST})
+-    #  message("Test ${TEST} resulted in ${${tst}}")
+-    #endforeach()
+-  endif()
++  # We are cross-compliling and can not run anything.
++  set( ${TEST} 1)
+ endmacro()
+ 
+ #
diff --git a/src/itk-1-gdmcsocket.patch b/src/itk-1-gdmcsocket.patch
deleted file mode 100644
index ac656a5..0000000
--- a/src/itk-1-gdmcsocket.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -burN InsightToolkit-4.8.2.orig/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
---- InsightToolkit-4.8.2.orig/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt	2015-12-02 13:19:53.030344390 +0100
-+++ InsightToolkit-4.8.2/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt	2015-12-02 13:32:36.094384138 +0100
-@@ -6,6 +6,8 @@
- include(CheckFunctionExists)
- CHECK_FUNCTION_EXISTS(strsignal SOCKETXX_HAVE_STRSIGNAL)
- 
-+add_definitions(-Dsocketxx_EXPORTS)
-+
- # specific
- if(WIN32)
- else()
-@@ -67,6 +69,8 @@
-     )
- endif()
- 
-+set(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-+
- add_library(${SOCKETXX_LIBRARY_NAME} ${libsocket___la_SOURCES})
- if(WIN32)
-   target_link_libraries(${SOCKETXX_LIBRARY_NAME} ws2_32.lib)
-@@ -103,4 +107,3 @@
-     DESTINATION ${SOCKETXX_INSTALL_INCLUDE_DIR} COMPONENT Headers
-   )
- endif()
--
diff --git a/src/itk.mk b/src/itk.mk
index ff0cece..cb059c3 100644
--- a/src/itk.mk
+++ b/src/itk.mk
@@ -2,8 +2,8 @@
 
 PKG             := itk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.8.2
-$(PKG)_CHECKSUM := fec268ba180bdb78d760aa4f6f467d0a5fc71b3a34e3201d8425d0edfa23ef5f
+$(PKG)_VERSION  := 4.10.1
+$(PKG)_CHECKSUM := 334312cc31925fd6c2622c9cd4ed33fecbbbd5b97e03b93f34b259d08352eed7
 $(PKG)_SUBDIR   := InsightToolkit-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
author	Boris Nagaev <bnagaev@gmail.com>	2016-10-25 20:41:47 (GMT)
committer	GitHub <noreply@github.com>	2016-10-25 20:41:47 (GMT)
commit	03a1860982017d098022000cec11fa30d35c0c18 (patch)
tree	2ddda1237872962e0edf41e75f5ee7fc63cdc972 /src
parent	2c8b747d9cf58672040ff7443d2c365dba978fa5 (diff)
parent	55e9bbada5adf4497f01805d2b0d817183325612 (diff)
download	mxe-03a1860982017d098022000cec11fa30d35c0c18.zip mxe-03a1860982017d098022000cec11fa30d35c0c18.tar.gz mxe-03a1860982017d098022000cec11fa30d35c0c18.tar.bz2