|
| 1 | +From c7961dd9e12d72b279db75fd184d2b3b4f151560 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Greg Eisenhauer <eisen@cc.gatech.edu> |
| 3 | +Date: Mon, 26 Jan 2026 15:55:08 -0500 |
| 4 | +Subject: [PATCH] Fix MacOS Static build without FFI |
| 5 | + |
| 6 | +--- |
| 7 | + thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in | 4 +++- |
| 8 | + thirdparty/ffs/CMakeLists.txt | 6 +++++- |
| 9 | + 2 files changed, 8 insertions(+), 2 deletions(-) |
| 10 | + |
| 11 | +diff --git a/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in b/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in |
| 12 | +index 16afb7ef7d..9b35728090 100644 |
| 13 | +--- a/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in |
| 14 | ++++ b/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in |
| 15 | +@@ -4,7 +4,9 @@ find_dependency(atl @atl_VERSION@) |
| 16 | + find_dependency(ffs @ffs_VERSION@) |
| 17 | + |
| 18 | + if(NOT @BUILD_SHARED_LIBS@) |
| 19 | +- find_dependency(dill @dill_VERSION@) |
| 20 | ++ if(@HAVE_COD_H@) |
| 21 | ++ find_dependency(dill @dill_VERSION@) |
| 22 | ++ endif() |
| 23 | + |
| 24 | + if(@NVML_FOUND@) |
| 25 | + find_dependency(NVML) |
| 26 | +diff --git a/thirdparty/ffs/CMakeLists.txt b/thirdparty/ffs/CMakeLists.txt |
| 27 | +index e47512f581..ebead5095d 100644 |
| 28 | +--- a/thirdparty/ffs/CMakeLists.txt |
| 29 | ++++ b/thirdparty/ffs/CMakeLists.txt |
| 30 | +@@ -4,7 +4,11 @@ set(BUILD_TESTING OFF) |
| 31 | + set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty") |
| 32 | + |
| 33 | + set(FFS_USE_ATL ON CACHE INTERNAL "") |
| 34 | +-set(FFS_USE_DILL ON CACHE INTERNAL "") |
| 35 | ++if(TARGET dill::dill) |
| 36 | ++ set(FFS_USE_DILL ON CACHE INTERNAL "") |
| 37 | ++else() |
| 38 | ++ set(FFS_USE_DILL OFF CACHE INTERNAL "") |
| 39 | ++endif() |
| 40 | + set(FFS_LIBRARIES_ONLY ON CACHE INTERNAL "") |
| 41 | + set(FFS_QUIET ON CACHE INTERNAL "") |
| 42 | + set(FFS_LIBRARY_PREFIX adios2${ADIOS2_LIBRARY_SUFFIX}_ CACHE INTERNAL "") |
0 commit comments