From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 4 Jun 2019 22:16:51 +0000 (+0200)
Subject: cmake: put the macOS libffi hack in FindGLIB instead of FindGTKGLExt
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a3c53601cae552e9fe2799331843dbb98c3d99f;p=xonotic%2Fnetradiant.git

cmake: put the macOS libffi hack in FindGLIB instead of FindGTKGLExt
---

diff --git a/cmake/FindGLIB.cmake b/cmake/FindGLIB.cmake
index 4b1b2650..cf12399e 100644
--- a/cmake/FindGLIB.cmake
+++ b/cmake/FindGLIB.cmake
@@ -1,5 +1,10 @@
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
+    if (APPLE)
+        # libffi is provided by base system so brew does not take the risk to override it
+        # hence then need for an explicit look-up
+        set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/libffi/lib/pkgconfig")
+    endif ()
     if (GLIB_FIND_REQUIRED)
         set(_pkgconfig_REQUIRED REQUIRED)
     endif ()
diff --git a/cmake/FindGtkGLExt.cmake b/cmake/FindGtkGLExt.cmake
index 40a0c858..8fa486e5 100644
--- a/cmake/FindGtkGLExt.cmake
+++ b/cmake/FindGtkGLExt.cmake
@@ -4,9 +4,6 @@ if (PKG_CONFIG_FOUND)
         set(_pkgconfig_REQUIRED REQUIRED)
     endif ()
     if (APPLE)
-        # libffi is provided by base system so brew does not take the risk to override it
-        # hence then need for an explicit look-up
-        set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/libffi/lib/pkgconfig")
         pkg_check_modules(GtkGLExt ${_pkgconfig_REQUIRED} gtkglext-1.0 gtkglext-quartz-1.0)
     elseif (XWINDOWS)
         pkg_check_modules(GtkGLExt ${_pkgconfig_REQUIRED} gtkglext-x11-1.0)