3 files changed, 29 insertions, 12 deletions
diff --git a/science/arbor/files/patch-CMakeLists.txt b/science/arbor/files/patch-CMakeLists.txt
index b813375ca016..9a056733f8ea 100644
--- a/science/arbor/files/patch-CMakeLists.txt
+++ b/science/arbor/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2024-08-09 10:22:00 UTC
+--- CMakeLists.txt.orig	2025-04-24 10:33:03 UTC
 +++ CMakeLists.txt
-@@ -40,7 +40,7 @@ check_cxx_compiler_flag("-march=native" CXX_HAS_NATIVE
+@@ -60,7 +60,7 @@ check_cxx_compiler_flag("-march=native" CXX_HAS_NATIVE
  
  # Specify target architecture.
  check_cxx_compiler_flag("-march=native" CXX_HAS_NATIVE)
@@ -9,11 +9,16 @@
      set(ARB_DEFAULT_ARCH "native")
  else()
      set(ARB_DEFAULT_ARCH "none")
-@@ -307,7 +307,6 @@ install(TARGETS ext-units EXPORT arbor-targets)
- install(TARGETS ext-random123 EXPORT arbor-targets)
- target_link_libraries(arbor-public-deps INTERFACE ext-units)
- install(TARGETS ext-units EXPORT arbor-targets)
--install(TARGETS units compile_flags_target EXPORT arbor-targets)
+@@ -302,11 +302,7 @@ install(TARGETS ext-hwloc EXPORT arbor-targets)
+ endif()
+ install(TARGETS ext-hwloc EXPORT arbor-targets)
  
- # Keep track of packages we need to add to the generated CMake config
- # file for arbor.
+-CPMFindPackage(NAME json
+-              GITHUB_REPOSITORY nlohmann/json
+-              VERSION 3.12.0
+-              OPTIONS "CMAKE_SUPPRESS_DEVELOPER_WARNINGS ON")
+-install(TARGETS nlohmann_json EXPORT arbor-targets)
++find_package(nlohmann_json REQUIRED)
+ 
+ add_library(ext-random123 INTERFACE)
+ CPMFindPackage(NAME random123
diff --git a/science/arbor/files/patch-cmake_CPM.cmake b/science/arbor/files/patch-cmake_CPM.cmake
new file mode 100644
index 000000000000..5d3f5f935cac
--- /dev/null
+++ b/science/arbor/files/patch-cmake_CPM.cmake
@@ -0,0 +1,12 @@
+--- cmake/CPM.cmake.orig	2025-04-24 10:33:03 UTC
++++ cmake/CPM.cmake
+@@ -9,6 +9,9 @@ elseif(DEFINED ENV{CPM_SOURCE_CACHE})
+   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+ elseif(DEFINED ENV{CPM_SOURCE_CACHE})
+   set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
++elseif(DEFINED ENV{CPM_REPO})
++  include("$ENV{CPM_REPO}/cmake/CPM.cmake")
++  return()
+ else()
+   set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+ endif()
diff --git a/science/arbor/files/patch-sup_CMakeLists.txt b/science/arbor/files/patch-sup_CMakeLists.txt
index 95eac6c5f7eb..7fff28ceb029 100644
--- a/science/arbor/files/patch-sup_CMakeLists.txt
+++ b/science/arbor/files/patch-sup_CMakeLists.txt
@@ -1,4 +1,4 @@
---- sup/CMakeLists.txt.orig	2024-08-09 10:22:00 UTC
+--- sup/CMakeLists.txt.orig	2025-04-24 10:33:03 UTC
 +++ sup/CMakeLists.txt
 @@ -3,7 +3,7 @@ set(sup-sources
      json_meter.cpp
@@ -7,5 +7,5 @@
 -add_library(arbor-sup ${sup-sources})
 +add_library(arbor-sup STATIC ${sup-sources})
  
- if (ARB_USE_BUNDLED_FMT)
-     target_include_directories(arbor-sup
+ target_link_libraries(arbor-sup PRIVATE fmt::fmt-header-only)
+