From 7d7fd3387969ef194293f95436d64fdc6916644f Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Wed, 29 Jun 2022 07:40:32 +0200 Subject: [PATCH] improve Windows crosscompile handling (#1236) --- .CMake/gcc_clang_intrinsics.cmake | 6 +++++- CMakeLists.txt | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.CMake/gcc_clang_intrinsics.cmake b/.CMake/gcc_clang_intrinsics.cmake index 4bbb4aaa5..fd45d753e 100644 --- a/.CMake/gcc_clang_intrinsics.cmake +++ b/.CMake/gcc_clang_intrinsics.cmake @@ -9,7 +9,11 @@ if(NOT COMPILE_RESULT) message(FATAL_ERROR "Could not compile .CMake/detect_gcc_clang_intrinsics.c" ${COMPILE_OUTPUT}) endif() if(NOT RUN_RESULT EQUAL 0) - message(FATAL_ERROR ".CMake/detect_gcc_clang_intrinsics.c returned exit code: " ${RUN_RESULT}) + if(CMAKE_CROSSCOMPILING) + message(STATUS "Detecting language features in cross-compiling mode impossible. Setting all CPU features OFF.") + else() + message(FATAL_ERROR ".CMake/detect_gcc_clang_intrinsics.c returned exit code: " ${RUN_RESULT}) + endif() endif() foreach(CPU_EXTENSION ${RUN_OUTPUT}) if (NOT DEFINED OQS_USE_${CPU_EXTENSION}_INSTRUCTIONS) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08cf4a363..e76fcbe12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,13 @@ endif() if(POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() +if(POLICY CMP0066) + cmake_policy(SET CMP0066 NEW) +endif() +if(POLICY CMP0067) + cmake_policy(SET CMP0067 NEW) +endif() + project(liboqs C ASM)