From 2a5f8d5bab6746e28e98ecf2fe3f35b844e91fae Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Thu, 22 Feb 2024 00:24:44 +0000 Subject: [PATCH] Skip the check on MacOS It doesn't work, the workaround isn't enough to make it work, I can't be bothered making a more powerful workaround, and it's impossible to *package* a MacOS build missing the plugins we need anyway, even if you can build and attempt to run it. --- components/misc/osgpluginchecker.cpp.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/misc/osgpluginchecker.cpp.in b/components/misc/osgpluginchecker.cpp.in index 4b89551206..e58c6c59b2 100644 --- a/components/misc/osgpluginchecker.cpp.in +++ b/components/misc/osgpluginchecker.cpp.in @@ -15,11 +15,14 @@ namespace Misc { -#ifdef OSG_LIBRARY_STATIC +#if defined(OSG_LIBRARY_STATIC) || defined(__APPLE__) bool checkRequiredOSGPluginsArePresent() { // assume they were linked in at build time and CMake would have failed if they were missing + // true-ish for MacOS - they're copied into the package and that'd fail if they were missing, + // but if you don't actually make a MacOS package and run a local build, this won't notice. + // the workaround in the real implementation isn't powerful enough to make MacOS work, though. return true; }