diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-01-31 23:45:44 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-02-01 00:54:42 +0100 |
| commit | ec98dc113f7622cd9701ac2303f384cf59c8af77 (patch) | |
| tree | 274a0acc0eadb4dac08614e705245b79053782fa /CMakeLists.txt | |
| parent | 29d9e31c51e6c11d6e33abf9bc4551afd9de3836 (diff) | |
CMake: Fix image libraries build if fallback is used
The CMake instructions would use the wrong image libs (png, jpeg, zlib)
if the fallback was active (OPTION_USE_SYSTEM_XXX) was true but the
header files were not present.
This had already been fixed for jpeg but not for the other two libs.
This commit rearranges the logic for all three libs.
Add information about builtin or system libraries to config summary.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb4e8ecac..1c8f3d160 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org) # Originally written by Michael Surette # -# Copyright 1998-2021 by Bill Spitzak and others. +# Copyright 1998-2022 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 @@ -19,12 +19,6 @@ # set CMake minimum version (must be before `project()` ####################################################################### -# Note: previous (1.3.5) minimum version -# cmake_minimum_required (VERSION 2.6.3) - -# Note: minimum CMake version required by GNUInstallDirs -# cmake_minimum_required (VERSION 2.8.4) - # Minimum CMake version required by FLTK 1.4 (06/2020, work in progress) cmake_minimum_required (VERSION 3.2.3 FATAL_ERROR) @@ -225,5 +219,23 @@ else () message (STATUS "Example programs will not be built (set FLTK_BUILD_EXAMPLES=ON to build)") endif () +if (FLTK_USE_BUILTIN_JPEG) + message (STATUS "Image Libraries: JPEG = Builtin") +else () + message (STATUS "Image Libraries: JPEG = System") +endif () + +if (FLTK_USE_BUILTIN_PNG) + message (STATUS " PNG = Builtin") +else () + message (STATUS " PNG = System") +endif () + +if (FLTK_USE_BUILTIN_ZLIB) + message (STATUS " ZLIB = Builtin") +else () + message (STATUS " ZLIB = System") +endif () + message ("") message (STATUS "End of Configuration Summary --\n") |