diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-02-28 14:56:19 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-03-01 10:45:59 +0100 |
| commit | 49a78bc482bc112248a05f0b1ea78bcf80403efa (patch) | |
| tree | f57c0c1a98e240a64cb2a05fdea19d6781a5ab87 /fluid | |
| parent | 266b5e7cddaaca312b77abd5696e0281af3251c9 (diff) | |
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)
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
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 |