mirror of https://github.com/djcb/mu.git
meson: build updates
This commit is contained in:
parent
03993b93b2
commit
de80b557e8
|
@ -15,7 +15,7 @@
|
||||||
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
|
|
||||||
guile_load_path=':'.join([
|
guile_load_path=':'.join([ # meson 0.56 has project_source_root
|
||||||
join_paths(meson.source_root(), 'guile'),
|
join_paths(meson.source_root(), 'guile'),
|
||||||
join_paths(meson.current_build_dir(), '..')])
|
join_paths(meson.current_build_dir(), '..')])
|
||||||
|
|
||||||
|
|
|
@ -77,18 +77,18 @@ lib_mu=static_library(
|
||||||
install: false)
|
install: false)
|
||||||
|
|
||||||
# some of the libme headers include xapian
|
# some of the libme headers include xapian
|
||||||
xapian_incs = xapian_dep.get_pkgconfig_variable('includedir')
|
|
||||||
lib_mu_dep = declare_dependency(
|
lib_mu_dep = declare_dependency(
|
||||||
link_with: lib_mu,
|
link_with: lib_mu,
|
||||||
|
dependencies: [ lib_mu_message_dep ],
|
||||||
include_directories:
|
include_directories:
|
||||||
include_directories(['.', '..', xapian_incs]))
|
include_directories(['.', '..']))
|
||||||
|
|
||||||
# test helpers
|
# test helpers
|
||||||
lib_test_mu_common=static_library('mu-test-common', [
|
lib_test_mu_common=static_library('mu-test-common', [
|
||||||
'tests/test-mu-common.cc',
|
'tests/test-mu-common.cc',
|
||||||
'tests/test-mu-common.hh'],
|
'tests/test-mu-common.hh'],
|
||||||
dependencies: [ glib_dep, thread_dep,
|
dependencies: [ glib_dep, thread_dep,
|
||||||
config_h_dep])
|
config_h_dep ])
|
||||||
lib_test_mu_common_dep=declare_dependency(
|
lib_test_mu_common_dep=declare_dependency(
|
||||||
link_with: lib_test_mu_common,
|
link_with: lib_test_mu_common,
|
||||||
include_directories: include_directories(['tests']))
|
include_directories: include_directories(['tests']))
|
||||||
|
|
Loading…
Reference in New Issue