From 787c67afea179735f2fea12f95ad04c80b3717e7 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Mon, 12 Jul 2021 19:26:28 +0200
Subject: macOS: fix fltk_cairo shared library (issue #250)

- add missing dependencies to build the shared libfltk_cairo(.dylib)
- remove incorrect dependency on cairo from libfltk
- add cairo_test-shared demo (linked with shared libs)
---
 cairo/CMakeLists.txt | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'cairo')

diff --git a/cairo/CMakeLists.txt b/cairo/CMakeLists.txt
index 2cfa912fd..181f30ed5 100644
--- a/cairo/CMakeLists.txt
+++ b/cairo/CMakeLists.txt
@@ -1,17 +1,27 @@
 
-include_directories(${PKG_CAIRO_INCLUDE_DIRS})
+include_directories (${PKG_CAIRO_INCLUDE_DIRS})
 
 # source files for cairo
-set(cairo_SRCS Fl_Cairo.cxx)
+set (cairo_SRCS Fl_Cairo.cxx)
 
 #######################################################################
-FL_ADD_LIBRARY(fltk_cairo STATIC "${cairo_SRCS}")
+FL_ADD_LIBRARY (fltk_cairo STATIC "${cairo_SRCS}")
 
 #######################################################################
-if(OPTION_BUILD_SHARED_LIBS)
+# Build shared library (optional)
 #######################################################################
-FL_ADD_LIBRARY(fltk_cairo SHARED "${cairo_SRCS}")
 
-#######################################################################
-endif(OPTION_BUILD_SHARED_LIBS)
+if (OPTION_BUILD_SHARED_LIBS)
+
+  FL_ADD_LIBRARY (fltk_cairo SHARED "${cairo_SRCS}")
+  target_link_libraries (fltk_cairo_SHARED fltk_SHARED ${PKG_CAIRO_LIBRARIES})
+
+  if (CMAKE_VERSION VERSION_LESS "3.13")
+    link_directories (${PKG_CAIRO_LIBRARY_DIRS})
+  else()
+    target_link_directories (fltk_cairo_SHARED PRIVATE ${PKG_CAIRO_LIBRARY_DIRS})
+  endif()
+
+endif (OPTION_BUILD_SHARED_LIBS)
+
 #######################################################################
-- 
cgit v1.2.3