Created
October 23, 2016 22:50
-
-
Save starius/b7b1ee84faa76de1f52efe3f1959dc1d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: Boris Nagaev <bnagaev@gmail.com> | |
Date: Sun, 23 Oct 2016 22:14:39 +0000 | |
Subject: [PATCH] . | |
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() | |
# |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment