talipot-core/PluginLibraryLoader: Fix compilation on macOS 14

anlambert · Nov 27, 2024 · 103d9a7 · 103d9a7
1 parent 01cd817
commit 103d9a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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<int (*)(const dirent *)>(__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<int (*)(const dirent *)>(__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
@@ -118,11 +118,17 @@ elif platform.system() == 'Linux':
 class CustomWheel(bdist_wheel):
     """Override platform tags when building a wheel."""
 
+    def initialize_options(self):
+        super().initialize_options()
+
     def finalize_options(self):
         platform_name = get_platform("_")
         if "universal2" in platform_name:
             self.plat_name = platform_name.replace("universal2", platform.uname().machine)
 
+    def run(self):
+        super().run()
+
 
 
 here = path.abspath(path.dirname(__file__))