From 8e99c3b1e68f1224e035a48b90b859de455e473a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 15 Dec 2023 03:08:49 -0500
Subject: [PATCH] Make AVX setting less annoying
---
indra/cmake/00-Common.cmake | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 020c0962bc0..115ab71f58c 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -45,12 +45,9 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
"Supported build types." FORCE)
# SIMD config
-option(USE_SSE42 "Enable usage of the SSE4.2 instruction set" ON)
-option(USE_AVX "Enable usage of the AVX instruction set" OFF)
option(USE_AVX2 "Enable usage of the AVX2 instruction set" OFF)
-if((USE_SSE42 AND USE_AVX) OR (USE_SSE42 AND USE_AVX AND USE_AVX2) OR (USE_AVX AND USE_AVX2))
- message(FATAL_ERROR "Usage of multiple SIMD flags is unsupported")
-endif()
+option(USE_AVX "Enable usage of the AVX instruction set" OFF)
+option(USE_SSE42 "Enable usage of the SSE4.2 instruction set" ON)
# Warnings
option(DISABLE_FATAL_WARNINGS "Disable warnings as errors" ON)
--
GitLab