From 49a78bc482bc112248a05f0b1ea78bcf80403efa Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 28 Feb 2021 14:56:19 +0100 Subject: Fix cairo build (autoconf + CMake) + README's - rewrite to use pkg-config with both autoconf + CMake - remove hardcoded library names - fix build dependencies and search directories - remove or replace old and unused variables - update README files To be done: - implement fallback for autoconf/configure if pkg-config is missing - fix pango build (uses cairo internally) --- fluid/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'fluid') diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index d429affe2..fcf4cedb1 100644 --- a/fluid/CMakeLists.txt +++ b/fluid/CMakeLists.txt @@ -1,7 +1,7 @@ # # CMakeLists.txt to build fluid for the FLTK project using CMake (www.cmake.org) # -# Copyright 1998-2020 by Bill Spitzak and others. +# Copyright 1998-2021 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -69,7 +69,10 @@ else () add_executable (fluid WIN32 ${CPPFILES}) endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) -target_link_libraries(fluid fltk fltk_images fltk_forms) +target_link_libraries (fluid fltk fltk_images fltk_forms) +if (FLTK_HAVE_CAIRO) + target_link_directories (fluid PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) +endif (FLTK_HAVE_CAIRO) # install fluid -- cgit v1.2.3