mirror of https://git.wownero.com/dsc/mxe.git
update itk to 4.10.1
This commit is contained in:
parent
fbcbd9b81c
commit
55e9bbada5
|
@ -35,3 +35,77 @@ index 1111111..2222222 100644
|
|||
)
|
||||
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()
|
||||
|
||||
#
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue