From eb053bc9577f38360a033dbc6e1b317e06deaa4b Mon Sep 17 00:00:00 2001
From: Chris McFarlen <cmcfarlen@apple.com>
Date: Mon, 18 Sep 2023 15:17:01 -0500
Subject: [PATCH] Fix cmake autooptions

---
 CMakeLists.txt                |  6 ------
 cmake/AutoOptionHelpers.cmake | 10 +++++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fa39d39e99..c871c599039 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,6 @@ auto_option(HWLOC FEATURE_VAR TS_USE_HWLOC PACKAGE_DEPENDS hwloc)
 auto_option(JEMALLOC
     FEATURE_VAR TS_HAS_JEMALLOC
     PACKAGE_DEPENDS jemalloc
-    DEFAULT OFF
 )
 auto_option(MIMALLOC
     FEATURE_VAR TS_HAS_MIMALLOC
@@ -204,11 +203,6 @@ else()
 endif()
 set(HAVE_SYS_CAPABILITY_H ${cap_FOUND})
 
-find_package(hwloc)
-if(hwloc_FOUND)
-    set(TS_USE_HWLOC TRUE)
-endif()
-
 find_package(LibLZMA)
 if(LibLZMA_FOUND)
         set(HAVE_LZMA_H TRUE)
diff --git a/cmake/AutoOptionHelpers.cmake b/cmake/AutoOptionHelpers.cmake
index 2527123715e..21b5ce2428a 100644
--- a/cmake/AutoOptionHelpers.cmake
+++ b/cmake/AutoOptionHelpers.cmake
@@ -34,11 +34,12 @@ endfunction()
 
 macro(_CHECK_PACKAGE_DEPENDS _OPTION_VAR _PACKAGE_DEPENDS _FEATURE_VAR)
   if(${${_OPTION_VAR}} STREQUAL AUTO)
-    set(STRICTNESS QUIET)
+    set(STRICTNESS)
   else()
     set(STRICTNESS REQUIRED)
   endif()
 
+
   foreach(PACKAGE_NAME ${_PACKAGE_DEPENDS})
     find_package(${PACKAGE_NAME} ${STRICTNESS})
     if(NOT ${PACKAGE_NAME}_FOUND)
@@ -97,7 +98,10 @@ macro(auto_option _FEATURE_NAME)
     set(FEATURE_VAR "USE_${_FEATURE_NAME}")
   endif()
 
-  if(NOT ARG_DEFAULT)
+
+  if(ARG_DEFAULT STREQUAL OFF)
+    set(DEFAULT OFF)
+  elseif(NOT ARG_DEFAULT)
     set(DEFAULT AUTO)
   elseif(ARG_DEFAULT MATCHES "(ON)|(AUTO)|(TRUE)|(1)")
     set(DEFAULT ${ARG_DEFAULT})
@@ -107,7 +111,7 @@ macro(auto_option _FEATURE_NAME)
 
   _register_auto_option(${OPTION_VAR} ${FEATURE_VAR} "${ARG_DESCRIPTION}" "${DEFAULT}")
 
-  if(${${OPTION_VAR}})
+  if(${${OPTION_VAR}} MATCHES "(ON)|(AUTO)|(TRUE)|(1)")
     set(${FEATURE_VAR} TRUE)
     _check_package_depends(${OPTION_VAR} "${ARG_PACKAGE_DEPENDS}" ${FEATURE_VAR})
   else()