Fix duplicate "Dependency rzheap found" messages (#5908)
This commit is contained in:
parent
7f57ae2c70
commit
5a30814c6a
3 changed files with 6 additions and 2 deletions
|
|
@ -167,7 +167,7 @@ rz_core_deps = [
|
|||
rz_mark_dep,
|
||||
platform_deps,
|
||||
dependency('rzgdb'),
|
||||
dependency('rzheap'),
|
||||
rzheap_dep,
|
||||
shell_parser_dep,
|
||||
lrt,
|
||||
mth,
|
||||
|
|
|
|||
|
|
@ -713,6 +713,10 @@ endif
|
|||
yxml_proj = subproject('yxml', default_options: ['default_library=static'])
|
||||
yxml_dep = yxml_proj.get_variable('yxml_dep')
|
||||
|
||||
# handle rzheap dependency
|
||||
rzheap_proj = subproject('rzheap', default_options: ['default_library=static'])
|
||||
rzheap_dep = rzheap_proj.get_variable('rzheap_dep')
|
||||
|
||||
use_rpath = false
|
||||
use_rpath_absolute = false
|
||||
if host_machine.system() != 'windows' and get_option('default_library') == 'shared'
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ if get_option('enable_tests')
|
|||
rz_magic_dep,
|
||||
rz_il_dep,
|
||||
rz_mark_dep,
|
||||
dependency('rzheap'),
|
||||
rzheap_dep,
|
||||
lrt,
|
||||
],
|
||||
install: false,
|
||||
|
|
|
|||
Loading…
Reference in a new issue