From 4b1a9e23eea28301667a7d4c71caba139ad328a9 Mon Sep 17 00:00:00 2001 From: John Schanck Date: Sun, 14 Mar 2021 15:32:52 -0400 Subject: [PATCH] Make OQS_USE_CPU_EXTENSIONS imply OQS_PORTABLE_BUILD=OFF; alternative to #939 (#942) --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1032e398e..dd2931be0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,11 @@ else() message(FATAL_ERROR "Unknown or unsupported processor: " ${CMAKE_SYSTEM_PROCESSOR}) endif() +if(NOT OQS_USE_CPU_EXTENSIONS AND OQS_PORTABLE_BUILD) + message(WARNING "OQS_PORTABLE_BUILD requires OQS_USE_CPU_EXTENSIONS") + set(OQS_PORTABLE_BUILD OFF) +endif() + if(OQS_PORTABLE_BUILD AND ARCH_X86_64) set(OQS_PORTABLE_X86_64_BUILD ON) endif()