diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2016-10-23 23:05:09 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2016-10-24 00:30:24 (GMT) |
commit | 55e9bbada5adf4497f01805d2b0d817183325612 (patch) | |
tree | 1805b14b7987dba48b8a270fe61081b353fe7ed9 /src/itk-1-fixes.patch | |
parent | fbcbd9b81c218da7d4ee747bdc4333fa36d79677 (diff) | |
download | mxe-55e9bbada5adf4497f01805d2b0d817183325612.zip mxe-55e9bbada5adf4497f01805d2b0d817183325612.tar.gz mxe-55e9bbada5adf4497f01805d2b0d817183325612.tar.bz2 |
update itk to 4.10.1
Diffstat (limited to 'src/itk-1-fixes.patch')
-rw-r--r-- | src/itk-1-fixes.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/src/itk-1-fixes.patch b/src/itk-1-fixes.patch index 8105c78..38e596c 100644 --- a/src/itk-1-fixes.patch +++ b/src/itk-1-fixes.patch @@ -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() + + # |