smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wrong usage of `extra_link_args` variable.

This commit is contained in:
Matthieu Gautier 2024-06-03 14:19:33 +02:00
parent a1ce3d10b1
commit 01b94418eb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -48,12 +48,15 @@ if host_machine.system() == 'windows' and static_deps
endif endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
add_project_arguments('-DNOMINMAX', language: 'cpp') add_project_arguments('-DNOMINMAX', language: 'cpp')
extra_libs += ['-liphlpapi'] extra_libs += ['-liphlpapi']
else
extra_link_args = []
endif endif
if build_machine.system() == 'windows'
extra_libs += ['-lshlwapi', '-lwinmm']
endif
all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep, xapian_dep] all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep, xapian_dep]
inc = include_directories('include', extra_include) inc = include_directories('include', extra_include)

2
test/meson.build
View File

@ -77,7 +77,7 @@ if gtest_dep.found() and not meson.is_cross_build()
implicit_include_directories: false, implicit_include_directories: false,
include_directories : inc, include_directories : inc,
link_with : libkiwix, link_with : libkiwix,
link_args: extra_link_args, link_args: extra_libs,
dependencies : all_deps + [gtest_dep], dependencies : all_deps + [gtest_dep],
build_rpath : '$ORIGIN') build_rpath : '$ORIGIN')
test(test_name, test_exe, timeout : 160) test(test_name, test_exe, timeout : 160)