mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 00:51:49 +08:00
94bc827441
* Minor changes * Shortcut loaders.cache generation With -Dbuiltin-loaders=all, the cache file contains nothing but comment lines. However, the generation is flaky on windows in vcpkg CI. * Revise tool fixup (fixes mingw cross builds) * Update versions
21 lines
934 B
Diff
21 lines
934 B
Diff
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
|
|
index 54ff9dd..27f8512 100644
|
|
--- a/gdk-pixbuf/meson.build
|
|
+++ b/gdk-pixbuf/meson.build
|
|
@@ -348,7 +348,14 @@ foreach bin: gdkpixbuf_bin
|
|
set_variable(bin_name.underscorify(), bin)
|
|
endforeach
|
|
|
|
-if not meson.is_cross_build()
|
|
+if dynamic_loaders.length() == 0
|
|
+ # skip tool invocation
|
|
+ cmake = find_program('cmake', required : true)
|
|
+ loaders_cache = custom_target('loaders.cache', output: 'loaders.cache', capture: true,
|
|
+ command: [ cmake, '-E', 'echo', '# No dynamic loaders enabled at build time' ],
|
|
+ build_by_default: true)
|
|
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
|
|
+elif not meson.is_cross_build()
|
|
# The 'loaders.cache' used for testing, so we don't accidentally
|
|
# load the installed cache; we always build it by default
|
|
loaders_cache = custom_target('loaders.cache',
|