From 1c7c0b48d30a34d87a8a212de7e27215e6bce255 Mon Sep 17 00:00:00 2001
From: karurochari <nope>
Date: Sun, 15 Dec 2024 20:48:39 +0000
Subject: [PATCH] Simplify meson file & maybe fix for system fltk?

---
 .github/workflows/build.yml |  3 ++-
 meson.build                 | 12 +++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 51f7e401..7686670a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,7 +85,8 @@ jobs:
             freeglut \
             libpng \
             meson \
-            ninja
+            ninja \
+            fltk
           brew install --cask xquartz
           cd /opt/homebrew/opt/llvm/bin
           #ln -s clang++ clang++-19
diff --git a/meson.build b/meson.build
index add9384e..0e212de2 100644
--- a/meson.build
+++ b/meson.build
@@ -61,10 +61,8 @@ if need_pugixml or get_option('use_system_pugixml') == false
 endif
 
 if get_option('use_system_fltk')
-    libfltk_dep = dependency('fltk', version: '>=1.4', required: false)
-    libfltk_images_dep = dependency('fltk-images', version: '>=1.4', required: false)
-    libfltk_forms_dep = dependency('fltk-forms', version: '>=1.4', required: false)
-    if libfltk_dep.found() == false or libfltk_images_dep.found() == false or libfltk_forms_dep.found() == false
+    libfltk_dep = dependency('FLTK', version: '>=1.4.0', module: ['fltk-shared','fltk_image-shared','fltk_forms-shared'], required: false)
+    if libfltk_dep.found() == false
         need_fltk = true
     endif
 endif
@@ -86,9 +84,7 @@ if need_fltk == true or get_option('use_system_fltk') == false
     endif
 
     libfltk_proj = cmake.subproject('libfltk', options: opt_fltk)
-    libfltk_dep = libfltk_proj.dependency(['fltk-shared'])
-    libfltk_images_dep = libfltk_proj.dependency(['fltk-images-shared'])
-    libfltk_forms_dep = libfltk_proj.dependency(['fltk-forms-shared'])
+    libfltk_dep = [ libfltk_proj.dependency(['fltk-shared']),  libfltk_proj.dependency(['fltk-images-shared']), libfltk_proj.dependency(['fltk-forms-shared'])]
     #libfltk_gl_dep = libfltk_proj.dependency(['fltk-gl'])
 endif
 
@@ -199,8 +195,6 @@ include_dirs = include_directories(['./include'])
 
 vs_fltk_deps += [
     libfltk_dep,
-    libfltk_images_dep,
-    libfltk_forms_dep,
 
     pugixml_dep,
     json_dep,