From e2db2131ef74915b10bb9c1c0d27b76f4acadc6f Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Tue, 1 Oct 2024 17:29:14 -0700
Subject: [PATCH] test

---
 CMakeLists.txt          | 13 +++++++++----
 src/test/CMakeLists.txt |  7 +++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09e226272c103e..171c010b2ce185 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         message(STATUS "Boost Root set to: ${BOOST_R}")
     endif()
     set(Boost_USE_MULTITHREADED ON)
-    set(Boost_NO_BOOST_CMAKE ON)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set(ENV{target} "Linux")
     file(READ "/proc/version" _SYS_VERSION)
@@ -95,15 +94,21 @@ if(BerkeleyDB_FOUND)
 endif()
 
 find_package(LibEvent REQUIRED)
-
 find_package(GMP REQUIRED)
-
 find_package(ZMQ)
 find_package(Miniupnp)
 find_package(NAT-PMP)
-find_package(Boost COMPONENTS system filesystem chrono thread REQUIRED)
 find_package(Sodium REQUIRED)
 
+set(Boost_VERBOSE ON)
+# Use the now deprecated FindBoost internal for CMake versions 3.30.0 and above
+# TODO: re-work this to support the upstream BoostConfig.cmake configuration.
+if(CMAKE_VERSION VERSION_LESS "3.30.0")
+else()
+    cmake_policy(SET CMP0167 NEW)
+endif()
+find_package(Boost COMPONENTS system filesystem chrono thread REQUIRED)
+
 include_directories(${GMP_INCLUDE_DIR})
 
 # run autogen.sh if missing header files from configure on Linux/Mac
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index ec37a463f78f5f..06c015d7be8dd9 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -2,6 +2,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.14)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(Boost_USE_STATIC_LIBS ON)
+set(Boost_VERBOSE ON)
+# Use the now deprecated FindBoost internal for CMake versions 3.30.0 and above
+# TODO: re-work this to support the upstream BoostConfig.cmake configuration.
+if(CMAKE_VERSION VERSION_LESS "3.30.0")
+else()
+    cmake_policy(SET CMP0167 NEW)
+endif()
 find_package(Boost COMPONENTS system filesystem chrono thread unit_test_framework REQUIRED)
 
 set(JSON_TEST_FILES