diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-12-04 17:31:18 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-12-04 17:31:18 +0100 |
| commit | cf07fa09dc752d1283c22a2df402e7356b770871 (patch) | |
| tree | 511e5f7dd9de295b23a35172afc0cddc9ce1d13e /CMake | |
| parent | a73a14347db54693fa486e2ebf400d7ce26231e6 (diff) | |
Minor updates of bundled libraries and README.CMake.txt
Update Makefiles, CMakeLists.txt, improve formatting.
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/options.cmake | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index b5150dee2..cc7060bd8 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -2,7 +2,7 @@ # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org) # Originally written by Michael Surette # -# Copyright 1998-2022 by Bill Spitzak and others. +# Copyright 1998-2023 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 @@ -125,12 +125,12 @@ endif () # If either of them is not available, we fall back to using both local libraries if (OPTION_USE_SYSTEM_LIBPNG AND NOT (OPTION_USE_SYSTEM_ZLIB AND ZLIB_FOUND)) set (PNG_FOUND FALSE) - set (OPTION_USE_SYSTEM_LIBPNG FALSE) + set (OPTION_USE_SYSTEM_LIBPNG OFF) message (STATUS "Local z lib selected: overriding png lib to local for compatibility.\n") endif () if (OPTION_USE_SYSTEM_ZLIB AND NOT (OPTION_USE_SYSTEM_LIBPNG AND PNG_FOUND)) set (ZLIB_FOUND FALSE) - set (OPTION_USE_SYSTEM_ZLIB FALSE) + set (OPTION_USE_SYSTEM_ZLIB OFF) message (STATUS "Local png lib selected: overriding z lib to local for compatibility.\n") endif () @@ -951,6 +951,14 @@ if (DEBUG_OPTIONS_CMAKE) fl_debug_var (OPENGL_FOUND) fl_debug_var (OPENGL_INCLUDE_DIR) fl_debug_var (OPENGL_LIBRARIES) + fl_debug_var (CMAKE_MSVC_RUNTIME_LIBRARY) + message ("--- bundled libraries ---") + fl_debug_var (OPTION_USE_SYSTEM_LIBJPEG) + fl_debug_var (OPTION_USE_SYSTEM_LIBPNG) + fl_debug_var (OPTION_USE_SYSTEM_ZLIB) + fl_debug_var (FLTK_USE_BUILTIN_JPEG) + fl_debug_var (FLTK_USE_BUILTIN_PNG) + fl_debug_var (FLTK_USE_BUILTIN_ZLIB) message ("--- X11 ---") fl_debug_var (X11_FOUND) fl_debug_var (X11_INCLUDE_DIR) |