mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
163065a352
* update meson to 0.60.1 * add port vcpkg-tool-meson for consistency deprecate usage of tool-meson * [skip actions] make every port using meson depend on vcpkg-tool-meson (except pkgconf for now.) * fix subtle bugs in vcpkg_find_acquire_program make the port install meson if the system does not provide it. * make pkgconf depend on meson * restore old vcpkg_find_acquire_program behavior for versioning * Update ports/gstreamer/vcpkg.json remove duplicated dependency * remove invalid option in glib * [skip actions] fix ci failures? * remove invalid option in gstreamer * try without cmake * get more logs from meson configure. * update glib to 2.70.1 * fix typo * fix pc file of flac * update meson to 0.60.2 * try the patch from the other pr. * patch meson ..... * version stuff * fix port version * fix gstreamer version * remove version * format-manifest * version stuff * format manifest again * revert version stuff * remove outdated gtk options * version stuff * pango version stuff * correct baseline lost in merge * Fix fontconfig version db Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
15 lines
596 B
Diff
15 lines
596 B
Diff
diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py
|
|
index 537af1f89..43d7febf2 100644
|
|
--- a/tools/meson/mesonbuild/dependencies/misc.py
|
|
+++ b/tools/meson/mesonbuild/dependencies/misc.py
|
|
@@ -610,7 +610,8 @@ iconv_factory = DependencyFactory(
|
|
|
|
intl_factory = DependencyFactory(
|
|
'intl',
|
|
+ [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE],
|
|
+ cmake_name='Intl',
|
|
- [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM],
|
|
builtin_class=IntlBuiltinDependency,
|
|
system_class=IntlSystemDependency,
|
|
)
|