diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /science/arbor/files/patch-CMakeLists.txt | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'science/arbor/files/patch-CMakeLists.txt')
| -rw-r--r-- | science/arbor/files/patch-CMakeLists.txt | 23 |
1 files changed, 14 insertions, 9 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 |