mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 16:59:02 +08:00
f468f46b78
* [glib] Update to 2.75.3. * [glib] Fix intl detection when consumed in CMake. When consuming glib in CMake through `pkg_check_modules`, libintl (provided by `gettext`) needs to specified in the pc file as `-lintl` without any quotation. Otherwise it is not picked up as a dependency and static linking fails. Also `vcpkg_fixup_pkgconfig` needs to be called before editing pc files. * [glib] Cleanup portfile. * [glib] Update baseline.
18 lines
719 B
Diff
18 lines
719 B
Diff
diff --git a/meson.build b/meson.build
|
|
index f44fa2d4e..d465253af 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -2088,9 +2088,9 @@
|
|
# proxy-libintl subproject.
|
|
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
|
|
# implementations. This could be extended if issues are found in some platforms.
|
|
-libintl_deps = []
|
|
-libintl = dependency('intl', required: false, allow_fallback: false)
|
|
-if libintl.found()
|
|
+libintl = dependency('Intl', method:'cmake', required: true)
|
|
+libintl_deps = [libintl]
|
|
+if false
|
|
# libintl supports different threading APIs, which may not
|
|
# require additional flags, but it defaults to using pthreads if
|
|
# found. Meson's "threads" dependency does not allow you to
|