From 1a3c53601cae552e9fe2799331843dbb98c3d99f Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Wed, 5 Jun 2019 00:16:51 +0200 Subject: [PATCH] cmake: put the macOS libffi hack in FindGLIB instead of FindGTKGLExt --- cmake/FindGLIB.cmake | 5 +++++ cmake/FindGtkGLExt.cmake | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) 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) -- 2.39.2