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 /src | |
| 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 'src')
| -rw-r--r-- | src/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4e8d8c759..7c64a3a9d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -518,7 +518,7 @@ endif (WIN32) if (FLTK_HAVE_CAIRO) list (APPEND OPTIONAL_LIBS fltk_cairo ${PKG_CAIRO_LIBRARIES}) -ENDif (FLTK_HAVE_CAIRO) +endif (FLTK_HAVE_CAIRO) if (HAVE_XINERAMA) list (APPEND OPTIONAL_LIBS ${X11_Xinerama_LIB}) @@ -537,10 +537,9 @@ if (HAVE_XRENDER) endif (HAVE_XRENDER) if (USE_PANGO) - list (APPEND OPTIONAL_LIBS ${HAVE_LIB_PANGO} ${HAVE_LIB_PANGOXFT} ${HAVE_LIB_PANGOCAIRO} ${HAVE_LIB_CAIRO} ${HAVE_LIB_GOBJECT}) - #if (NOT APPLE) - # list (APPEND OPTIONAL_LIBS ${HAVE_LIB_GOBJECT} ) - #endif (NOT APPLE) + ### FIXME ### This needs to use the PKG_* variables directly + list (APPEND OPTIONAL_LIBS ${HAVE_LIB_PANGO} ${HAVE_LIB_PANGOXFT} ${HAVE_LIB_PANGOCAIRO}) + list (APPEND OPTIONAL_LIBS ${HAVE_LIB_CAIRO} ${HAVE_LIB_GOBJECT}) endif (USE_PANGO) if (USE_XFT) |