From 48eac86f95e4ea6ac489bf6ed83b7e7384216163 Mon Sep 17 00:00:00 2001
From: Julien Schueller <schueller@phimeca.com>
Date: Sun, 17 May 2026 14:17:54 +0200
Subject: [PATCH 1/3] fmi4c: Backport macos fix

See https://github.com/robbr48/fmi4c/pull/97
---
 fmi4c/src/fmi4c.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/fmi4c/src/fmi4c.c b/fmi4c/src/fmi4c.c
index f27445ab..e45d9edb 100644
--- a/fmi4c/src/fmi4c.c
+++ b/fmi4c/src/fmi4c.c
@@ -24,14 +24,20 @@
 #include <sys/stat.h>
 #endif
 
-#if defined(__x86_64__) || defined(_M_X64)
-    #define arch_str "x86_64"
+#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
     #define bits_str "64"
 #else
-    #define arch_str "x86"
     #define bits_str "32"
 #endif
 
+#if defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
+    #define arch_str "aarch64"
+#elif defined(__x86_64__) || defined(_M_X64)
+    #define arch_str "x86_64"
+#else
+    #define arch_str "x86"
+#endif
+
 #if defined(__CYGWIN__)
     #define dirsep_str "/"
 #elif defined(_WIN32)
@@ -44,6 +50,10 @@
     #define dllext_str ".dll"
     #define fmi12_system_str "win"
     #define fmi3_system_str "windows"
+#elif defined(__APPLE__)
+    #define dllext_str ".dylib"
+    #define fmi12_system_str "darwin"
+    #define fmi3_system_str "darwin"
 #else
     #define dllext_str ".so"
     #define fmi12_system_str "linux"

From ad6a963714ad982631245134da404a8b6fa65654 Mon Sep 17 00:00:00 2001
From: Julien Schueller <schueller@phimeca.com>
Date: Sun, 17 May 2026 14:18:45 +0200
Subject: [PATCH 2/3] Add OM_USE_SYSTEM_ZLIB option

---
 CMakeLists.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 776c74f4..2f4ccad8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,16 @@ add_library(oms::3rd::kinsol ALIAS sundials_kinsol_static)
 #########################################################################
 ## zlib.
 message(STATUS "##### 3rdParty zlib")
-add_subdirectory(zlib EXCLUDE_FROM_ALL)
+option(OM_USE_SYSTEM_ZLIB "Use system zlib" OFF)
+if (OM_USE_SYSTEM_ZLIB)
+  set(ZLIB_USE_STATIC_LIBS ON)
+  find_package(ZLIB MODULE REQUIRED)
+  unset(ZLIB_USE_STATIC_LIBS)
+  add_library(zlibstatic INTERFACE)
+  target_link_libraries(zlibstatic INTERFACE ZLIB::ZLIB)
+else ()
+  add_subdirectory(zlib EXCLUDE_FROM_ALL)
+endif ()
 add_library(oms::3rd::zlib ALIAS zlibstatic)
 
 #########################################################################

From 3bd102f0221763976e4685584719ece1ca3a7b78 Mon Sep 17 00:00:00 2001
From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com>
Date: Wed, 26 Aug 2026 14:23:15 +0200
Subject: [PATCH 3/3] Fix merge errors

---
 CMakeLists.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85fcfac6..4e2909f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,6 @@ add_library(oms::3rd::sundials::kinsol ALIAS sundials_kinsol_static)
 #########################################################################
 ## zlib.
 message(STATUS "##### 3rdParty zlib")
-<<<<<<< HEAD
 option(OM_USE_SYSTEM_ZLIB "Use system zlib" OFF)
 if (OM_USE_SYSTEM_ZLIB)
   set(ZLIB_USE_STATIC_LIBS ON)
@@ -87,13 +86,10 @@ if (OM_USE_SYSTEM_ZLIB)
   add_library(zlibstatic INTERFACE)
   target_link_libraries(zlibstatic INTERFACE ZLIB::ZLIB)
 else ()
+  set(ZLIB_BUILD_SHARED OFF CACHE BOOL "Disable zlib shared library")
+  set(ZLIB_BUILD_TESTING OFF CACHE BOOL "Disable zlib's own test suite; it registers global ctest targets (zlib_install, zlib_find_package_*, ...) that don't apply when zlib is only vendored as a static-lib dependency")
   add_subdirectory(zlib EXCLUDE_FROM_ALL)
 endif ()
-=======
-set(ZLIB_BUILD_SHARED OFF CACHE BOOL "Disable zlib shared library")
-set(ZLIB_BUILD_TESTING OFF CACHE BOOL "Disable zlib's own test suite; it registers global ctest targets (zlib_install, zlib_find_package_*, ...) that don't apply when zlib is only vendored as a static-lib dependency")
-add_subdirectory(zlib EXCLUDE_FROM_ALL)
->>>>>>> origin/master
 add_library(oms::3rd::zlib ALIAS zlibstatic)
 # Expose zlibstatic as ZLIB::ZLIB so libzip's find_package(ZLIB) resolves to our
 # in-tree build without requiring a system zlib (e.g. Alpine, Windows).