diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-03-15 23:34:56 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-03-16 00:10:53 +0100 |
| commit | b252e5e45cfd87da48133a3a52e3ac164759b231 (patch) | |
| tree | 16be1e15561e913e9e9c023a170bb9b062d5bfc8 /CMake | |
| parent | 2e1730d2f0f131d792c9b0561672f5252a868785 (diff) | |
Remove libfltk_cairo (fltk::cairo)
This library is no longer needed and was "empty" for backwards
compatibility since FLTK 1.4.0.
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/FLTKConfig.cmake.in | 2 | ||||
| -rw-r--r-- | CMake/fl_create_example.cmake | 16 | ||||
| -rw-r--r-- | CMake/options.cmake | 2 |
3 files changed, 3 insertions, 17 deletions
diff --git a/CMake/FLTKConfig.cmake.in b/CMake/FLTKConfig.cmake.in index 0eef0585a..14876d3a0 100644 --- a/CMake/FLTKConfig.cmake.in +++ b/CMake/FLTKConfig.cmake.in @@ -117,7 +117,7 @@ else(CMAKE_CROSSCOMPILING) _fltk_make_alias(fltk-options fltk::options) _fltk_make_alias(fltk-options-cmd fltk::options-cmd) - foreach(target cairo forms gl images jpeg png z) + foreach(target forms gl images jpeg png z) _fltk_make_alias(fltk_${target} fltk::${target}) _fltk_make_alias(fltk_${target}-shared fltk::${target}-shared) endforeach() diff --git a/CMake/fl_create_example.cmake b/CMake/fl_create_example.cmake index 854f02e59..571e33b43 100644 --- a/CMake/fl_create_example.cmake +++ b/CMake/fl_create_example.cmake @@ -2,7 +2,7 @@ # A function used by the CMake build system for the Fast Light Tool Kit (FLTK). # Originally written by Michael Surette # -# Copyright 1998-2024 by Bill Spitzak and others. +# Copyright 1998-2025 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 @@ -114,20 +114,6 @@ function(fl_create_example NAME SOURCES LIBRARIES) set_target_properties (${TARGET_NAME} PROPERTIES ENABLE_EXPORTS TRUE) - ### *FIXME* Remove the entire 'if' block below when verified: - - if(0) # This should no longer be necessary (implied by linking the libs) - - # we must link all programs with Cairo if option CAIROEXT is enabled - if(FLTK_HAVE_CAIROEXT) - target_link_libraries(${TARGET_NAME} PRIVATE ${PKG_CAIRO_LIBRARIES}) - endif() - - if(FLTK_HAVE_CAIRO AND PKG_CAIRO_LIBRARY_DIRS) - target_link_directories(${TARGET_NAME} PRIVATE ${PKG_CAIRO_LIBRARY_DIRS}) - endif() - - endif() # This should no longer be necessary (implied by linking the libs) # Search the current binary directory for header files created by CMake # or fluid and the source folder for other headers included by test programs diff --git a/CMake/options.cmake b/CMake/options.cmake index a9c41264d..aa4936b65 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -29,7 +29,7 @@ # which can be applied to particular targets and source files only. # # This could remove some of these potential build conflicts, for -# instance # if the bundled image libs and Cairo or Pango are used +# instance if the bundled image libs and Cairo or Pango are used # together (Pango depends on Cairo and Cairo depends on libpng). # However, this is not a proper solution! # |