[gjs/wip/jtojnar/nixos-fixes: 3/3] build: Install test libraries under installed_tests_execdir
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/jtojnar/nixos-fixes: 3/3] build: Install test libraries under installed_tests_execdir
- Date: Sat, 21 Mar 2020 07:56:07 +0000 (UTC)
commit 361a319789310292787d9c62665cef9e386a9b20
Author: Jan Tojnar <jtojnar gmail com>
Date: Sun Mar 15 01:53:30 2020 +0100
build: Install test libraries under installed_tests_execdir
We already have the typelibs there, there is no need to plague pkglibdir with the shared libraries that
are only used for testing either.
It will also make easier for distributions to install the installed tests separately.
installed-tests/js/meson.build | 7 +++----
installed-tests/minijasmine.cpp | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 3dc23f72..79ac4633 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -7,7 +7,6 @@ minijasmine = executable('minijasmine', '../minijasmine.cpp',
jsunit_resources_files, dependencies: libgjs_dep,
cpp_args: [
'-DINSTTESTDIR="@0@"'.format(installed_tests_execdir),
- '-DPKGLIBDIR="@0@"'.format(get_option('prefix') / pkglibdir)
],
include_directories: top_include,
install: get_option('installed_tests'), install_dir: installed_tests_execdir)
@@ -44,7 +43,7 @@ regress_sources = [
libregress = library('regress', regress_sources,
c_args: regress_gir_c_args + test_gir_warning_c_args,
dependencies: regress_dependencies, install: get_option('installed_tests'),
- install_dir: pkglibdir)
+ install_dir: installed_tests_execdir)
regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
identifier_prefix: 'Regress', symbol_prefix: 'regress_',
@@ -60,7 +59,7 @@ warnlib_sources = [
libwarnlib = library('warnlib', warnlib_sources,
c_args: test_gir_warning_c_args + test_gir_extra_c_args,
dependencies: [glib, gobject, gio], install: get_option('installed_tests'),
- install_dir: pkglibdir)
+ install_dir: installed_tests_execdir)
# This should have --warn-all turned off, but there is currently no way to do so
# in gnome.generate_gir(). See https://github.com/mesonbuild/meson/issues/5876
warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
@@ -77,7 +76,7 @@ gimarshallingtests_sources = [
libgimarshallingtests = library('gimarshallingtests',
gimarshallingtests_sources, dependencies: [glib, gobject, gio],
c_args: test_gir_extra_c_args + test_gir_warning_c_args,
- install: get_option('installed_tests'), install_dir: pkglibdir)
+ install: get_option('installed_tests'), install_dir: installed_tests_execdir)
gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
namespace: 'GIMarshallingTests', nsversion: '1.0',
diff --git a/installed-tests/minijasmine.cpp b/installed-tests/minijasmine.cpp
index b02a6eb0..f8ca8490 100644
--- a/installed-tests/minijasmine.cpp
+++ b/installed-tests/minijasmine.cpp
@@ -54,7 +54,7 @@ main(int argc, char **argv)
g_irepository_prepend_search_path(g_getenv("TOP_BUILDDIR"));
} else {
g_irepository_prepend_search_path(INSTTESTDIR);
- g_irepository_prepend_library_path(PKGLIBDIR);
+ g_irepository_prepend_library_path(INSTTESTDIR);
}
const char *coverage_prefix = g_getenv("GJS_UNIT_COVERAGE_PREFIX");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]