diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-05-30 10:23:17 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-31 15:59:38 +0200 |
| commit | b7426e91dbcbc9080e0018a43efd0aec1f5fc5ba (patch) | |
| tree | 22481b509a9bc114f4180987877b75ce3455e77b /libnm-glib | |
| parent | 7fcf33908be0ec10c7ed8a2a36bf8bf516058f5e (diff) | |
build: use default NM_BUILD_* defines for tests
Use two common defines NM_BUILD_SRCDIR and NM_BUILD_BUILDDIR
for specifying the location of srcdir and builddir.
Note that this is only relevant for tests, as they expect
a certain layout of the directories, to find files that concern
them.
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/meson.build | 4 | ||||
| -rw-r--r-- | libnm-glib/tests/meson.build | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index 9583362b6..aa1b7aaab 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -197,9 +197,7 @@ libnm_glib = shared_library( sources: sources + libnm_glib_enum + [nm_secret_agent_glue], version: libnm_glib_version, dependencies: deps, - c_args: cflags + [ - '-DNMRUNDIR="@0@"'.format(nm_pkgrundir), - ], + c_args: cflags, link_whole: libdeprecated_nm_glib, link_args: [ '-Wl,--version-script,@0@'.format(linker_script), diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build index 029b3c20c..fbabb9a9c 100644 --- a/libnm-glib/tests/meson.build +++ b/libnm-glib/tests/meson.build @@ -16,10 +16,11 @@ foreach test_unit: test_units test_unit, [test_unit + '.c'] + shared_test_utils, dependencies: deps, - c_args: common_cflags + [ - '-DNETWORKMANAGER_COMPILATION_TEST', - '-DTEST_NM_SERVICE="@0@"'.format(join_paths(meson.source_root(), 'tools', 'test-networkmanager-service.py')), - ], + c_args: + common_cflags + [ + '-DNETWORKMANAGER_COMPILATION_TEST', + ] + + nm_build_cflags, ) test( |