update to latest fltk

MoAlyousef · Feb 7, 2024 · 2e05365 · 2e05365
1 parent c87806e
commit 2e05365
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 77 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,4 +22,4 @@ jobs:
       shell: bash
     - uses: actions/checkout@v3
     - name: Build
-      run: git submodule update --init --recursive && cmake -Bbin -DCMAKE_BUILD_TYPE=Release -DOPTION_USE_SYSTEM_LIBPNG=OFF -DOPTION_USE_SYSTEM_LIBJPEG=OFF -DOPTION_USE_SYSTEM_ZLIB=OFF -DOPTION_USE_GL=OFF -DFLTK_BUILD_EXAMPLES=OFF -DFLTK_BUILD_TEST=OFF -DOPTION_USE_THREADS=ON -DOPTION_LARGE_FILE=ON -DOPTION_BUILD_HTML_DOCUMENTATION=OFF -DOPTION_BUILD_PDF_DOCUMENTATION=OFF && cmake --build bin --parallel
+      run: git submodule update --init --recursive && cmake -Bbin -DCMAKE_BUILD_TYPE=Release -DFLTK_USE_SYSTEM_LIBPNG=OFF -DFLTK_USE_SYSTEM_LIBJPEG=OFF -DFLTK_USE_SYSTEM_ZLIB=OFF -DFLTK_BUILD_GL=OFF -DFLTK_BUILD_EXAMPLES=OFF -DFLTK_BUILD_TEST=OFF -DFLTK_OPTION_LARGE_FILE=ON -DFLTK_BUILD_HTML_DOCS=OFF -DFLTK_BUILD_PDF_DOCS=OFF && cmake --build bin --parallel
diff --git a/README.md b/README.md
@@ -67,31 +67,29 @@ Options which can be used with cmake:
 ```
 $ cmake -B bin -S . \
     -DCMAKE_BUILD_TYPE=Release \
-    -DOPTION_USE_SYSTEM_LIBPNG=OFF \
-    -DOPTION_USE_SYSTEM_LIBJPEG=OFF \
-    -DOPTION_USE_SYSTEM_ZLIB=OFF \
-    -DOPTION_USE_GL=OFF \
+    -DFLTK_USE_SYSTEM_LIBPNG=OFF \
+    -DFLTK_USE_SYSTEM_LIBJPEG=OFF \
+    -DFLTK_USE_SYSTEM_ZLIB=OFF \
+    -DFLTK_BUILD_GL=OFF \
     -DFLTK_BUILD_EXAMPLES=OFF \
     -DFLTK_BUILD_TEST=OFF \
-    -DOPTION_USE_THREADS=ON \
-    -DOPTION_LARGE_FILE=ON \
-    -DOPTION_BUILD_HTML_DOCUMENTATION=OFF \
-    -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \
+    -DFLTK_OPTION_LARGE_FILE=ON \
+    -DFLTK_BUILD_HTML_DOCS=OFF \
+    -DFLTK_BUILD_PDF_DOCS=OFF \
 ```
-For pango support on linux (for rtl and cjk text), you can use `-DOPTION_USE_PANGO=ON`.
+For pango support on linux (for rtl and cjk text), you can use `-DFLTK_USE_PANGO=ON`.
 
 Otherwise, these options can be added to the CMakeLists.txt file:
 ```cmake
-    set(OPTION_USE_SYSTEM_LIBPNG OFF CACHE BOOL " " FORCE)
-    set(OPTION_USE_SYSTEM_LIBJPEG OFF CACHE BOOL " " FORCE)
-    set(OPTION_USE_SYSTEM_ZLIB OFF CACHE BOOL " " FORCE)
-    set(OPTION_USE_GL OFF CACHE BOOL " " FORCE)
+    set(FLTK_USE_SYSTEM_LIBPNG OFF CACHE BOOL " " FORCE)
+    set(FLTK_USE_SYSTEM_LIBJPEG OFF CACHE BOOL " " FORCE)
+    set(FLTK_USE_SYSTEM_ZLIB OFF CACHE BOOL " " FORCE)
+    set(FLTK_BUILD_GL OFF CACHE BOOL " " FORCE)
     set(FLTK_BUILD_EXAMPLES OFF CACHE BOOL " " FORCE)
     set(FLTK_BUILD_TEST OFF CACHE BOOL " " FORCE)
-    set(OPTION_USE_THREADS ON CACHE BOOL " " FORCE)
     set(OPTION_LARGE_FILE ON CACHE BOOL " " FORCE)
-    set(OPTION_BUILD_HTML_DOCUMENTATION OFF CACHE BOOL " " FORCE)
-    set(OPTION_BUILD_PDF_DOCUMENTATION OFF CACHE BOOL " " FORCE)
+    set(FLTK_BUILD_HTML_DOCS OFF CACHE BOOL " " FORCE)
+    set(FLTK_BUILD_PDF_DOCS OFF CACHE BOOL " " FORCE)
 ```
 
 An example app:

diff --git a/cmake_options.txt b/cmake_options.txt
@@ -1,14 +1,13 @@
-# Remove OPTION_USE_PANGO on Windows and MacOS
+# Remove FLTK_USE_PANGO on Windows and MacOS
 
 # cmake -B bin -S cfltk \
--DOPTION_USE_SYSTEM_LIBPNG=OFF \
--DOPTION_USE_SYSTEM_LIBJPEG=OFF \
--DOPTION_USE_SYSTEM_ZLIB=OFF \
--DOPTION_USE_GL=OFF \
+-DFLTK_USE_SYSTEM_LIBPNG=OFF \
+-DFLTK_USE_SYSTEM_LIBJPEG=OFF \
+-DFLTK_USE_SYSTEM_ZLIB=OFF \
+-DFLTK_USE_PANGO=OFF \
 -DFLTK_BUILD_EXAMPLES=OFF \
 -DFLTK_BUILD_TEST=OFF \
--DOPTION_USE_THREADS=ON \
--DOPTION_LARGE_FILE=ON \
--DOPTION_BUILD_HTML_DOCUMENTATION=OFF \
--DOPTION_BUILD_PDF_DOCUMENTATION=OFF \
--DOPTION_USE_PANGO=ON
+-DFLTK_OPTION_LARGE_FILE=ON \
+-DFLTK_BUILD_HTML_DOCS=OFF \
+-DFLTK_BUILD_PDF_DOCS=OFF \
+-DFLTK_USE_PANGO=ON
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,21 +1,20 @@
 cmake_minimum_required(VERSION 3.0)
 project(cfltk_examples)
 
-set(OPTION_USE_SYSTEM_LIBPNG OFF CACHE BOOL " " FORCE)
-set(OPTION_USE_SYSTEM_LIBJPEG OFF CACHE BOOL " " FORCE)
-set(OPTION_USE_SYSTEM_ZLIB OFF CACHE BOOL " " FORCE)
-set(OPTION_USE_GL OFF CACHE BOOL " " FORCE)
+set(FLTK_USE_SYSTEM_LIBPNG OFF CACHE BOOL " " FORCE)
+set(FLTK_USE_SYSTEM_LIBJPEG OFF CACHE BOOL " " FORCE)
+set(FLTK_USE_SYSTEM_ZLIB OFF CACHE BOOL " " FORCE)
+set(FLTK_BUILD_GL OFF CACHE BOOL " " FORCE)
 set(CFLTK_USE_OPENGL OFF CACHE BOOL " " FORCE)
 set(FLTK_BUILD_EXAMPLES OFF CACHE BOOL " " FORCE)
 set(FLTK_BUILD_TEST OFF CACHE BOOL " " FORCE)
-set(OPTION_USE_THREADS ON CACHE BOOL " " FORCE)
-set(OPTION_LARGE_FILE ON CACHE BOOL " " FORCE)
-set(OPTION_BUILD_HTML_DOCUMENTATION OFF CACHE BOOL " " FORCE)
-set(OPTION_BUILD_PDF_DOCUMENTATION OFF CACHE BOOL " " FORCE)
+set(FLTK_OPTION_LARGE_FILE ON CACHE BOOL " " FORCE)
+set(FLTK_BUILD_HTML_DOCS OFF CACHE BOOL " " FORCE)
+set(FLTK_BUILD_PDF_DOCS OFF CACHE BOOL " " FORCE)
 if (${CMAKE_SYSTE_NAME} STREQUAL MATCHES "Linux")
-    set(OPTION_USE_PANGO ON CACHE BOOL " " FORCE)
-    set(OPTION_USE_CAIRO ON CACHE BOOL " " FORCE)
-    set(OPTION_USE_WAYLAND OFF CACHE BOOL " " FORCE)
+    set(FLTK_USE_PANGO ON CACHE BOOL " " FORCE)
+    set(FLTK_GRAPHICS_CAIRO ON CACHE BOOL " " FORCE)
+    set(FLTK_BACKEND_WAYLAND OFF CACHE BOOL " " FORCE)
 endif()
 
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/.. cfltk)

diff --git a/fltk b/fltk
diff --git a/scripts/bootstrap_linux.sh b/scripts/bootstrap_linux.sh
@@ -1,19 +1,18 @@
 cmake -B bin -S . \
     -DCMAKE_BUILD_TYPE=Release \
-    -DOPTION_USE_SYSTEM_LIBPNG=OFF \
-    -DOPTION_USE_SYSTEM_LIBJPEG=OFF \
-    -DOPTION_USE_SYSTEM_ZLIB=OFF \
-    -DOPTION_USE_GL=OFF \
+    -DFLTK_USE_SYSTEM_LIBPNG=OFF \
+    -DFLTK_USE_SYSTEM_LIBJPEG=OFF \
+    -DFLTK_USE_SYSTEM_ZLIB=OFF \
+    -DFLTK_BUILD_GL=OFF \
     -DCFLTK_USE_OPENGL=OFF \
     -DFLTK_BUILD_EXAMPLES=OFF \
     -DFLTK_BUILD_TEST=OFF \
-    -DOPTION_USE_THREADS=ON \
-    -DOPTION_LARGE_FILE=ON \
-    -DOPTION_BUILD_HTML_DOCUMENTATION=OFF \
-    -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \
-    -DOPTION_USE_PANGO=ON \
-    -DOPTION_USE_CAIRO=ON \
-    -DOPTION_ALLOW_GTK_PLUGIN=OFF \
+    -DFLTK_OPTION_LARGE_FILE=ON \
+    -DFLTK_BUILD_HTML_DOCS=OFF \
+    -DFLTK_BUILD_PDF_DOCS=OFF \
+    -DFLTK_USE_PANGO=ON \
+    -DFLTK_GRAPHICS_CAIRO=ON \
+    -DFLTK_USE_LIBDECOR_GTKN=OFF \
     -DFLTK_BUILD_FLUID=OFF \
     -DFLTK_BUILD_FLTK_OPTIONS=OFF
 

diff --git a/scripts/bootstrap_linux_with_gl.sh b/scripts/bootstrap_linux_with_gl.sh
@@ -1,19 +1,18 @@
 cmake -B bin -S . \
     -DCMAKE_BUILD_TYPE=Release \
-    -DOPTION_USE_SYSTEM_LIBPNG=OFF \
-    -DOPTION_USE_SYSTEM_LIBJPEG=OFF \
-    -DOPTION_USE_SYSTEM_ZLIB=OFF \
-    -DOPTION_USE_GL=ON \
+    -DFLTK_USE_SYSTEM_LIBPNG=OFF \
+    -DFLTK_USE_SYSTEM_LIBJPEG=OFF \
+    -DFLTK_USE_SYSTEM_ZLIB=OFF \
+    -DFLTK_BUILD_GL=ON \
     -DCFLTK_USE_OPENGL=ON \
     -DFLTK_BUILD_EXAMPLES=OFF \
     -DFLTK_BUILD_TEST=OFF \
-    -DOPTION_USE_THREADS=ON \
-    -DOPTION_LARGE_FILE=ON \
-    -DOPTION_BUILD_HTML_DOCUMENTATION=OFF \
-    -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \
-    -DOPTION_USE_PANGO=ON \
-    -DOPTION_USE_CAIRO=ON \
-    -DOPTION_ALLOW_GTK_PLUGIN=OFF \
+    -DFLTK_OPTION_LARGE_FILE=ON \
+    -DFLTK_BUILD_HTML_DOCS=OFF \
+    -DFLTK_BUILD_PDF_DOCS=OFF \
+    -DFLTK_USE_PANGO=ON \
+    -DFLTK_GRAPHICS_CAIRO=ON \
+    -DFLTK_USE_LIBDECOR_GTK=OFF \
     -DFLTK_BUILD_FLUID=OFF \
     -DFLTK_BUILD_FLTK_OPTIONS=OFF
 

diff --git a/scripts/bootstrap_macos.sh b/scripts/bootstrap_macos.sh
@@ -1,15 +1,14 @@
 cmake -B bin -S . \
     -DCMAKE_BUILD_TYPE=Release \
-    -DOPTION_USE_SYSTEM_LIBPNG=OFF \
-    -DOPTION_USE_SYSTEM_LIBJPEG=OFF \
-    -DOPTION_USE_SYSTEM_ZLIB=OFF \
-    -DOPTION_USE_GL=OFF \
+    -DFLTK_USE_SYSTEM_LIBPNG=OFF \
+    -DFLTK_USE_SYSTEM_LIBJPEG=OFF \
+    -DFLTK_USE_SYSTEM_ZLIB=OFF \
+    -DFLTK_BUILD_GL=OFF \
     -DFLTK_BUILD_EXAMPLES=OFF \
     -DFLTK_BUILD_TEST=OFF \
-    -DOPTION_USE_THREADS=ON \
-    -DOPTION_LARGE_FILE=ON \
-    -DOPTION_BUILD_HTML_DOCUMENTATION=OFF \
-    -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \
+    -DFLTK_OPTION_LARGE_FILE=ON \
+    -DFLTK_BUILD_HTML_DOCS=OFF \
+    -DFLTK_BUILD_PDF_DOCS=OFF \
     -DFLTK_BUILD_FLUID=OFF \
     -DFLTK_BUILD_FLTK_OPTIONS=OFF
 

diff --git a/scripts/bootstrap_windows.sh b/scripts/bootstrap_windows.sh
@@ -1,16 +1,15 @@
 cmake -B bin -S . \
     -DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX" \
     -DCMAKE_BUILD_TYPE=Release \
-    -DOPTION_USE_SYSTEM_LIBPNG=OFF \
-    -DOPTION_USE_SYSTEM_LIBJPEG=OFF \
-    -DOPTION_USE_SYSTEM_ZLIB=OFF \
-    -DOPTION_USE_GL=OFF \
+    -DFLTK_USE_SYSTEM_LIBPNG=OFF \
+    -DFLTK_USE_SYSTEM_LIBJPEG=OFF \
+    -DFLTK_USE_SYSTEM_ZLIB=OFF \
+    -DFLTK_BUILD_GL=OFF \
     -DFLTK_BUILD_EXAMPLES=OFF \
     -DFLTK_BUILD_TEST=OFF \
-    -DOPTION_USE_THREADS=ON \
-    -DOPTION_LARGE_FILE=ON \
-    -DOPTION_BUILD_HTML_DOCUMENTATION=OFF \
-    -DOPTION_BUILD_PDF_DOCUMENTATION=OFF \
+    -DFLTK_OPTION_LARGE_FILE=ON \
+    -DFLTK_BUILD_HTML_DOCS=OFF \
+    -DFLTK_BUILD_PDF_DOCS=OFF \
     -GNinja \
     -DFLTK_BUILD_FLUID=OFF \
     -DFLTK_BUILD_FLTK_OPTIONS=OFF
+4 −4		.github/workflows/build.yml
+1 −1		.gitlab-ci.yml
+15 −11		CHANGES.txt
+53 −26		CMake/FLTK-Functions.cmake
+106 −16		CMake/FLTKConfig.cmake.in
+20 −19		CMake/cmake_uninstall.cmake.in
+1 −1		CMake/compatibility.cmake
+81 −57		CMake/export.cmake
+200 −69		CMake/fl_add_library.cmake
+85 −96		CMake/fl_create_example.cmake
+20 −20		CMake/fl_debug_pkg.cmake
+85 −16		CMake/fl_debug_var.cmake
+2 −2		CMake/install-symlinks.cmake.in
+33 −32		CMake/install.cmake
+722 −665		CMake/options.cmake
+93 −90		CMake/resources.cmake
+108 −83		CMake/setup.cmake
+124 −120		CMake/variables.cmake
+212 −186		CMakeLists.txt
+2 −2		FL/Fl.H
+1 −1		FL/Fl_Cairo.H
+1 −1		FL/Fl_Cairo_Window.H
+2 −2		FL/Fl_Native_File_Chooser.H
+1 −1		FL/Fl_Printer.H
+1 −1		FL/Fl_Table.H
+1 −1		FL/x11.H
+515 −341		README.CMake.txt
+46 −43		README.Cairo.txt
+3 −3		README.Wayland.txt
+4 −4		README.abi-version.txt
+8 −8		README.macOS.md
+11 −7		cairo/CMakeLists.txt
+71 −70		documentation/CMakeLists.txt
+1 −1		documentation/Makefile
+4 −4		documentation/README.txt
+1 −1		documentation/src/drawing.dox
+123 −0		documentation/src/migration_1_4.dox
+3 −3		documentation/src/wayland.dox
+49 −49		examples/CMakeLists.txt
+1 −1		examples/cairo-draw-x.cxx
+1 −1		examples/howto-simple-svg.cxx
+47 −59		fltk-options/CMakeLists.txt
+62 −88		fluid/CMakeLists.txt
+60 −31		jpeg/CMakeLists.txt
+2 −2		libdecor/build/fl_libdecor.c
+69 −31		png/CMakeLists.txt
+386 −347		src/CMakeLists.txt
+8 −7		src/Fl_Cairo.cxx
+1 −1		src/Fl_Message.cxx
+1 −1		src/Fl_Table.cxx
+2 −2		src/Fl_Window.cxx
+178 −187		test/CMakeLists.txt
+3 −3		test/cairo_test.cxx
+36 −30		zlib/CMakeLists.txt