Merge pull request #4472 from bgilbert/override_dependency
meson: Call `meson.override_dependency()` if Meson is new enough
This commit is contained in:
@@ -127,6 +127,10 @@ libzstd = library('zstd',
|
|||||||
libzstd_dep = declare_dependency(link_with: libzstd,
|
libzstd_dep = declare_dependency(link_with: libzstd,
|
||||||
include_directories: join_paths(zstd_rootdir,'lib')) # Do not expose private headers
|
include_directories: join_paths(zstd_rootdir,'lib')) # Do not expose private headers
|
||||||
|
|
||||||
|
if meson.version().version_compare('>=0.54.0')
|
||||||
|
meson.override_dependency('libzstd', libzstd_dep)
|
||||||
|
endif
|
||||||
|
|
||||||
# we link to both:
|
# we link to both:
|
||||||
# - the shared library (for public symbols)
|
# - the shared library (for public symbols)
|
||||||
# - the static library (for private symbols)
|
# - the static library (for private symbols)
|
||||||
|
|||||||
Reference in New Issue
Block a user