mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-08-31 14:05:33 +00:00
[#3680] Fix generating .pc file when dependencies are not detected through pkg-config
meson.build:1051:4: ERROR: requires argument not a string, library with pkgconfig-generated file or pkgconfig-dependency object, got <ExternalLibrary log4cplus: True>
This commit is contained in:
10
meson.build
10
meson.build
@@ -1042,21 +1042,21 @@ endif
|
|||||||
|
|
||||||
#### pkg-config
|
#### pkg-config
|
||||||
|
|
||||||
additional_requires = []
|
requires = []
|
||||||
foreach i : [KRB5_DEP, MYSQL_DEP, POSTGRESQL_DEP]
|
foreach i : [CRYPTO_DEP, KRB5_DEP, LOG4CPLUS_DEP, MYSQL_DEP, POSTGRESQL_DEP]
|
||||||
if i.found() and i.type_name() == 'pkgconfig'
|
if i.found() and i.type_name() == 'pkgconfig'
|
||||||
additional_requires += i
|
requires += i
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
if NETCONF_DEP.found()
|
if NETCONF_DEP.found()
|
||||||
additional_requires += ['libyang', 'sysrepo', 'libyang-cpp', 'sysrepo-cpp']
|
requires += ['libyang', 'sysrepo', 'libyang-cpp', 'sysrepo-cpp']
|
||||||
endif
|
endif
|
||||||
pkg.generate(
|
pkg.generate(
|
||||||
description: 'High-performance, extensible DHCP server engine',
|
description: 'High-performance, extensible DHCP server engine',
|
||||||
filebase: 'kea',
|
filebase: 'kea',
|
||||||
libraries: LIBS_BUILT_SO_FAR,
|
libraries: LIBS_BUILT_SO_FAR,
|
||||||
name: 'Kea',
|
name: 'Kea',
|
||||||
requires: [CRYPTO_DEP, LOG4CPLUS_DEP] + additional_requires,
|
requires: requires,
|
||||||
subdirs: 'kea',
|
subdirs: 'kea',
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user