From 568846491da025b57823adc63ae4920c6e7c7eef Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <mira@lottiefiles.com>
Date: Tue, 16 Apr 2024 15:12:14 +0200
Subject: [PATCH] build: enforcing saver/loader usage for given tool

Selecting a tool without choosing the required tools
resulted in a usage error. Now, the activation
of the appropriate saver/loader for a given tool
is enforced.
---
 examples/meson.build    |  2 +-
 meson.build             | 75 +++++++++++++++++++++--------------------
 src/loaders/meson.build | 14 ++++----
 src/savers/meson.build  |  4 +--
 4 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/examples/meson.build b/examples/meson.build
index db0fb50e..4aae13de 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -61,7 +61,7 @@ source_file = [
 ]
 
 
-if get_option('loaders').contains('all') == true or get_option('loaders').contains('lottie') == true
+if lottie_loader
   source_file += 'LottieExtension.cpp'
 endif
 
diff --git a/meson.build b/meson.build
index 0217bc2f..199007f4 100644
--- a/meson.build
+++ b/meson.build
@@ -32,53 +32,61 @@ if get_option('engines').contains('wg_beta') == true
 endif
 
 #Loaders
-all_loaders = false
+all_loaders = get_option('loaders').contains('all')
+svg_loader = all_loaders or get_option('loaders').contains('svg')
+tvg_loader = all_loaders or get_option('loaders').contains('tvg')
+png_loader = all_loaders or get_option('loaders').contains('png')
+jpg_loader = all_loaders or get_option('loaders').contains('jpg')
+lottie_loader = all_loaders or get_option('loaders').contains('lottie')
+ttf_loader = all_loaders or get_option('loaders').contains('ttf')
+webp_loader = all_loaders or get_option('loaders').contains('webp')
 
-if get_option('loaders').contains('all') == true
-    all_loaders = true
-endif
+#Savers
+all_savers = get_option('savers').contains('all')
+tvg_saver = all_savers or get_option('savers').contains('tvg')
+gif_saver = all_savers or get_option('savers').contains('gif')
 
-if all_loaders or get_option('loaders').contains('svg') == true
+#Tools
+all_tools = get_option('tools').contains('all')
+svg_loader = svg_loader or all_tools or get_option('tools').contains('svg')
+lottie_loader = lottie_loader or all_tools or get_option('tools').contains('lottie')
+tvg_saver = tvg_saver or all_tools or get_option('tools').contains('tvg')
+gif_saver = gif_saver or all_tools or get_option('tools').contains('gif')
+
+#Loaders/savers/tools config
+if svg_loader
     config_h.set10('THORVG_SVG_LOADER_SUPPORT', true)
 endif
 
-if all_loaders or get_option('loaders').contains('tvg') == true
+if tvg_loader
     config_h.set10('THORVG_TVG_LOADER_SUPPORT', true)
 endif
 
-if all_loaders or get_option('loaders').contains('png') == true
+if png_loader
    config_h.set10('THORVG_PNG_LOADER_SUPPORT', true)
 endif
 
-if all_loaders or get_option('loaders').contains('jpg') == true
+if jpg_loader
     config_h.set10('THORVG_JPG_LOADER_SUPPORT', true)
 endif
 
-if all_loaders or get_option('loaders').contains('lottie') == true
+if lottie_loader
     config_h.set10('THORVG_LOTTIE_LOADER_SUPPORT', true)
 endif
 
-if all_loaders or get_option('loaders').contains('ttf') == true
+if ttf_loader
     config_h.set10('THORVG_TTF_LOADER_SUPPORT', true)
 endif
 
-if all_loaders or get_option('loaders').contains('webp') == true
+if webp_loader
     config_h.set10('THORVG_WEBP_LOADER_SUPPORT', true)
 endif
 
-
-#Savers
-all_savers = false
-
-if get_option('savers').contains('all') == true
-    all_savers = true
-endif
-
-if all_savers or get_option('savers').contains('tvg') == true
+if tvg_saver
     config_h.set10('THORVG_TVG_SAVER_SUPPORT', true)
 endif
 
-if all_savers or get_option('savers').contains('gif') == true
+if gif_saver
     config_h.set10('THORVG_GIF_SAVER_SUPPORT', true)
 endif
 
@@ -112,13 +120,6 @@ if get_option('log') == true
     config_h.set10('THORVG_LOG_ENABLED', true)
 endif
 
-#Tools
-all_tools = false
-
-if get_option('tools').contains('all') == true
-    all_tools = true
-endif
-
 
 configure_file(
     output: 'config.h',
@@ -176,15 +177,15 @@ Summary:
         get_option('engines').contains('sw'),
         get_option('engines').contains('gl_beta'),
         get_option('engines').contains('wg_beta'),
-        all_loaders or get_option('loaders').contains('tvg'),
-        all_loaders or get_option('loaders').contains('svg'),
-        all_loaders or get_option('loaders').contains('ttf'),
-        all_loaders or get_option('loaders').contains('lottie'),
-        all_loaders or get_option('loaders').contains('png'),
-        all_loaders or get_option('loaders').contains('jpg'),
-        all_loaders or get_option('loaders').contains('webp'),
-        all_savers or get_option('savers').contains('tvg'),
-        all_savers or get_option('savers').contains('gif'),
+        tvg_loader,
+        svg_loader,
+        ttf_loader,
+        lottie_loader,
+        png_loader,
+        jpg_loader,
+        webp_loader,
+        tvg_saver,
+        gif_saver,
         get_option('bindings').contains('capi'),
         get_option('bindings').contains('wasm_beta'),
         get_option('log'),
diff --git a/src/loaders/meson.build b/src/loaders/meson.build
index 41db2a13..ea1d9e11 100644
--- a/src/loaders/meson.build
+++ b/src/loaders/meson.build
@@ -1,22 +1,22 @@
 subloader_dep = []
 
-if all_loaders or get_option('loaders').contains('tvg') == true
+if tvg_loader
     subdir('tvg')
 endif
 
-if all_loaders or get_option('loaders').contains('svg') == true
+if svg_loader
     subdir('svg')
 endif
 
-if all_loaders or get_option('loaders').contains('ttf') == true
+if ttf_loader
     subdir('ttf')
 endif
 
-if all_loaders or get_option('loaders').contains('lottie') == true
+if lottie_loader
     subdir('lottie')
 endif
 
-if all_loaders or get_option('loaders').contains('png') == true
+if png_loader
     if get_option('static') == true
         subdir('png')
     else
@@ -27,7 +27,7 @@ if all_loaders or get_option('loaders').contains('png') == true
     endif
 endif
 
-if all_loaders or get_option('loaders').contains('jpg') == true
+if jpg_loader
     if get_option('static') == true
         subdir('jpg')
     else
@@ -38,7 +38,7 @@ if all_loaders or get_option('loaders').contains('jpg') == true
     endif
 endif
 
-if all_loaders or get_option('loaders').contains('webp') == true
+if webp_loader
     if get_option('static') == true
         subdir('webp')
     else
diff --git a/src/savers/meson.build b/src/savers/meson.build
index f561577f..3276ce27 100644
--- a/src/savers/meson.build
+++ b/src/savers/meson.build
@@ -1,10 +1,10 @@
 subsaver_dep = []
 
-if all_savers or get_option('savers').contains('tvg') == true
+if tvg_saver
     subdir('tvg')
 endif
 
-if all_savers or get_option('savers').contains('gif') == true
+if gif_saver
     subdir('gif')
 endif