| @@ -1322,13 +1322,22 @@ else(NOT CMAKE_CROSSCOMPILING) | |||||
| file(MAKE_DIRECTORY ${GETARCH_DIR}) | file(MAKE_DIRECTORY ${GETARCH_DIR}) | ||||
| configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY) | configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY) | ||||
| if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") | if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") | ||||
| try_compile(GETARCH_RESULT ${GETARCH_DIR} | |||||
| SOURCES ${GETARCH_SRC} | |||||
| COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" | |||||
| OUTPUT_VARIABLE GETARCH_LOG | |||||
| COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} | |||||
| ) | |||||
| if (CMAKE_ASM_COMPILER_ID STREQUAL "") | |||||
| try_compile(GETARCH_RESULT ${GETARCH_DIR} | |||||
| SOURCES ${GETARCH_SRC} | |||||
| CMAKE_FLAGS "-DCMAKE_ASM_COMPILER=${CMAKE_C_COMPILER}" | |||||
| COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" | |||||
| OUTPUT_VARIABLE GETARCH_LOG | |||||
| COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} | |||||
| ) | |||||
| else() | |||||
| try_compile(GETARCH_RESULT ${GETARCH_DIR} | |||||
| SOURCES ${GETARCH_SRC} | |||||
| COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" | |||||
| OUTPUT_VARIABLE GETARCH_LOG | |||||
| COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} | |||||
| ) | |||||
| endif() | |||||
| if (NOT ${GETARCH_RESULT}) | if (NOT ${GETARCH_RESULT}) | ||||
| MESSAGE(FATAL_ERROR "Compiling getarch failed ${GETARCH_LOG}") | MESSAGE(FATAL_ERROR "Compiling getarch failed ${GETARCH_LOG}") | ||||
| endif () | endif () | ||||