diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-02-22 04:21:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-02-22 04:21:43 +0000 |
| commit | 78be016d0bd59d4c6bea07311ccdfb6f1b66efa0 (patch) | |
| tree | 9fb8bada2460ca17e01295cac64eb79e4ec60d9e /pango | |
| parent | 6aec701eeb49d6f583c4c1f060d0a72d61ec95e6 (diff) | |
| parent | afdf144ae84fd67ad773799a93407214e5cc2261 (diff) | |
| download | pango-78be016d0bd59d4c6bea07311ccdfb6f1b66efa0.tar.gz | |
Merge branch 'meson-msvc-cleanup' into 'main'
Meson: Clean up on Visual Studio builds
See merge request GNOME/pango!595
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/meson.build | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pango/meson.build b/pango/meson.build index 9f4c49be..f344bc8b 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -136,18 +136,10 @@ if build_gir gir_args = [ '--quiet', ] - harfbuzz_gobject_dep = dependency('harfbuzz-gobject', version: harfbuzz_req_version, required: false) - - if not harfbuzz_gobject_dep.found() and cc.get_argument_syntax() == 'msvc' - # The CMake build files for HarfBuzz (which is used for MSVC builds) do not - # generate pkg-config files, so look for harfbuzz-gobject.lib - harfbuzz_gobject_dep = cc.find_library('harfbuzz-gobject', has_headers: ['hb-gobject.h'], required: false) - endif - - if not harfbuzz_gobject_dep.found() - harfbuzz_gobject_dep = dependency('harfbuzz-gobject', version: harfbuzz_req_version, required: false, - fallback: ['harfbuzz', 'libharfbuzz_gobject_dep']) - endif + harfbuzz_gobject_dep = dependency('harfbuzz-gobject', + version: harfbuzz_req_version, + required: false, + fallback: ['harfbuzz', 'libharfbuzz_gobject_dep']) if harfbuzz_gobject_dep.found() pango_deps += harfbuzz_gobject_dep |