From f4f8c17bac1febcd26aea8b35fbb6615b5a7dc6a Mon Sep 17 00:00:00 2001 From: Antoine Lambert Date: Wed, 27 Nov 2024 00:51:44 +0100 Subject: [PATCH] talipot-core/PluginLibraryLoader: Fix compilation on macOS 14 --- library/talipot-core/src/PluginLibraryLoader.cpp | 4 ++-- .../bindings/talipot-core/packaging/setup.py.in | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/library/talipot-core/src/PluginLibraryLoader.cpp b/library/talipot-core/src/PluginLibraryLoader.cpp index e06a4fc0bc..17666eb563 100644 --- a/library/talipot-core/src/PluginLibraryLoader.cpp +++ b/library/talipot-core/src/PluginLibraryLoader.cpp @@ -349,7 +349,7 @@ bool PluginLibraryLoader::initPluginDir(PluginLoader *loader, bool recursive, struct dirent **namelist; int n = scandir(_pluginPath.c_str(), &namelist, #if !(defined(__APPLE__) || defined(__FreeBSD__)) || \ - (defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080) + (defined(__APPLE__) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 || defined(__arm64__))) reinterpret_cast(__talipot_select_libs), #else __talipot_select_libs, @@ -420,7 +420,7 @@ bool PluginLibraryLoader::initPluginDir(PluginLoader *loader, bool recursive, n = scandir(_pluginPath.c_str(), &namelist, #if !(defined(__APPLE__) || defined(__FreeBSD__)) || \ - (defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080) + (defined(__APPLE__) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 || defined(__arm64__))) reinterpret_cast(__talipot_select_dirs), #else __talipot_select_dirs, diff --git a/library/talipot-python/bindings/talipot-core/packaging/setup.py.in b/library/talipot-python/bindings/talipot-core/packaging/setup.py.in index 61c3c4b375..8da6368146 100644 --- a/library/talipot-python/bindings/talipot-core/packaging/setup.py.in +++ b/library/talipot-python/bindings/talipot-core/packaging/setup.py.in @@ -119,6 +119,7 @@ class CustomWheel(bdist_wheel): """Override platform tags when building a wheel.""" def finalize_options(self): + super().finalize_options() platform_name = get_platform("_") if "universal2" in platform_name: self.plat_name = platform_name.replace("universal2", platform.uname().machine)