Skip to content

Fixes for macos #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jschueller wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for macos #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48eac86
fmi4c: Backport macos fix
jschueller May 17, 2026
ad6a963
Add OM_USE_SYSTEM_ZLIB option
jschueller May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

#########################################################################
Expand Down
16 changes: 13 additions & 3 deletions fmi4c/src/fmi4c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand Down