summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-05-15 23:06:07 -0400
committerMatthias Clasen <mclasen@redhat.com>2023-05-15 23:06:07 -0400
commit9463e0f56c5054fb8575e00388ca49ea0b4677b9 (patch)
tree2786c6922bc3a02f969f539c4e602285c0f40e38
parent1c308431a64aaffbe8bd0d3a26223673fdae05a1 (diff)
downloadgtk+-9463e0f56c5054fb8575e00388ca49ea0b4677b9.tar.gz
Only build iconcache validator if it is used
-rw-r--r--gtk/gtkiconcachevalidator.c2
-rw-r--r--tools/meson.build4
2 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c
index 7cec4d486f..8ddd24a361 100644
--- a/gtk/gtkiconcachevalidator.c
+++ b/gtk/gtkiconcachevalidator.c
@@ -20,6 +20,7 @@
#include <glib.h>
#include <gdk-pixbuf/gdk-pixdata.h>
+#if defined(G_ENABLE_DEBUG) || defined(BUILD_TOOLS)
#define VERBOSE(x)
@@ -401,3 +402,4 @@ gtk_icon_cache_validate (CacheInfo *info)
return TRUE;
}
+#endif
diff --git a/tools/meson.build b/tools/meson.build
index 0e90d88945..af77a7abb6 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -31,7 +31,7 @@ gtk_tools = [
'gtk-builder-tool-screenshot.c',
'gtk-builder-tool-preview.c',
'fake-scope.c'], [libgtk_dep] ],
- ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+ ['gtk4-update-icon-cache', ['updateiconcache.c', '../gtk/gtkiconcachevalidator.c' ] + extra_update_icon_cache_objs, [ libgtk_dep ] ],
['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
]
@@ -47,7 +47,7 @@ foreach tool: gtk_tools
exe = executable(tool_name,
sources: tool_srcs,
include_directories: [confinc],
- c_args: common_cflags,
+ c_args: common_cflags + [ '-DBUILD_TOOLS' ],
dependencies: tool_deps,
install: true,
)