From dd704bbb254492681ea8836012d5a56a879bacb9 Mon Sep 17 00:00:00 2001
From: "F. Duncanh" <fduncanh@gmail.com>
Date: Sun, 29 Jan 2023 19:02:44 -0500
Subject: [PATCH] CMake adjustments for macOS

---
 CMakeLists.txt           | 25 +++++++++++++------------
 renderers/CMakeLists.txt |  4 +++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9abd6b4..08f729a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,18 +12,19 @@ if (ZOOMFIX )
   message (STATUS "cmake option ZOOMFIX is no longer used (if needed, ZOOMFIX is automatically applied if X11 libraries are present)" )
 endif()
 
-
-if ( NOT NO_X11_DEPS )
-find_package( X11  )
-  if ( X11_FOUND )
-    message (STATUS "Will compile using X11 Libraries  (use cmake option -DNO_X11_DEPS=ON if X11 dependence is not wanted)" )
-    link_libraries( ${X11_LIBRARIES} )
-    include_directories( ${X11_INCLUDE_DIR} )
-   else ()
-       message (STATUS "X11 libraries not found, will compile without X11 dependence" )
-   endif ()
-else()
-   message (STATUS "will compile without X11 dependence" )
+if ( ( UNIX AND NOT APPLE ) OR USE_X11 )
+  if ( NOT NO_X11_DEPS )
+  find_package( X11  )
+    if ( X11_FOUND )
+      message (STATUS "Will compile using X11 Libraries  (use cmake option -DNO_X11_DEPS=ON if X11 dependence is not wanted)" )
+      link_libraries( ${X11_LIBRARIES} )
+      include_directories( ${X11_INCLUDE_DIR} )
+    else ()
+      message (STATUS "X11 libraries not found, will compile without X11 dependence" )
+    endif ()
+  else()
+    message (STATUS "will compile without X11 dependence" )
+  endif()
 endif()
 
 if( UNIX AND NOT APPLE )
diff --git a/renderers/CMakeLists.txt b/renderers/CMakeLists.txt
index 08d7523..23d6ec5 100644
--- a/renderers/CMakeLists.txt
+++ b/renderers/CMakeLists.txt
@@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 3.4.1)
 
-set( ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig" ) # standard location for self-installed gstreamer
 if (APPLE )
   set( ENV{PKG_CONFIG_PATH} "/Library/FrameWorks/GStreamer.framework/Libraries/pkgconfig" ) # GStreamer.framework, preferred
+  set( ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig" ) # Brew or self-installed gstreamer  
   set( ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/opt/local/lib/pkgconfig/" ) # MacPorts
   message( "PKG_CONFIG_PATH (Apple, renderers) = " $ENV{PKG_CONFIG_PATH} )
   find_program( PKG_CONFIG_EXECUTABLE  pkg-config  PATHS /Library/FrameWorks/GStreamer.framework/Commands )
   set(PKG_CONFIG_EXECUTABLE ${PKG_CONFIG_EXECUTABLE} --define-prefix )
+else()
+  set( ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig" ) # standard location for self-installed gstreamer
 endif()
 
 find_package( PkgConfig REQUIRED )