mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 01:29:08 +08:00
a6fff517cc
Fixes #38312 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] SHA512s are updated for each updated download. - [ ] The "supports" clause reflects platforms that may be fixed by this new version. - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [ ] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
26 lines
813 B
Diff
26 lines
813 B
Diff
diff --git a/meson.build b/meson.build
|
|
index 03eb140f0..eadd32088 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -196,7 +196,7 @@ else
|
|
endif
|
|
endif
|
|
|
|
-lzo_dep = dependency('lzo2', required: false)
|
|
+lzo_dep = dependency('lzo2', required: get_option('lzo'))
|
|
if lzo_dep.found()
|
|
conf.set('HAVE_LZO', 1)
|
|
endif
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index f481ef3ea..3ba4dacb1 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -23,6 +23,7 @@ option('glib', type : 'feature', value : 'auto')
|
|
option('spectre', type : 'feature', value : 'auto')
|
|
option('symbol-lookup', type: 'feature', value : 'auto',
|
|
description: 'Symbol lookup in debug utils via binutils/bfd')
|
|
+option('lzo', type : 'feature', value : 'auto')
|
|
|
|
# Documentation
|
|
option('gtk_doc', type : 'boolean', value : false,
|