Commit 412c706b authored by Philip Withnall's avatar Philip Withnall

Merge branch 'installed-tests-again' into 'master'

tests: Don’t use install kwarg to configure_file(); it doesn’t exist

See merge request !6
parents ac7de376 6fd504eb
Pipeline #47156 passed with stages
in 13 minutes and 30 seconds
......@@ -17,14 +17,27 @@ libglib_testing_public_deps = [
libglib_testing_include_subdir = join_paths(libglib_testing_api_name, 'libglib-testing')
libglib_testing = library(libglib_testing_api_name,
libglib_testing_sources + libglib_testing_headers,
dependencies: libglib_testing_public_deps,
include_directories: root_inc,
install: not meson.is_subproject(),
version: meson.project_version(),
soversion: libglib_testing_api_version,
)
# FIXME: https://github.com/mesonbuild/meson/issues/2992
if meson.is_subproject()
libglib_testing = static_library(libglib_testing_api_name,
libglib_testing_sources + libglib_testing_headers,
dependencies: libglib_testing_public_deps,
include_directories: root_inc,
install: not meson.is_subproject(),
version: meson.project_version(),
soversion: libglib_testing_api_version,
)
else
libglib_testing = library(libglib_testing_api_name,
libglib_testing_sources + libglib_testing_headers,
dependencies: libglib_testing_public_deps,
include_directories: root_inc,
install: not meson.is_subproject(),
version: meson.project_version(),
soversion: libglib_testing_api_version,
)
endif
libglib_testing_dep = declare_dependency(
link_with: libglib_testing,
include_directories: root_inc,
......@@ -48,4 +61,4 @@ if not meson.is_subproject()
endif
subdir('docs')
subdir('tests')
\ No newline at end of file
subdir('tests')
......@@ -25,13 +25,14 @@ foreach program: test_programs
test_conf.set('installed_tests_dir', installed_tests_execdir)
test_conf.set('program', program[0])
configure_file(
input: test_template,
output: program[0] + '.test',
install: enable_installed_tests,
install_dir: installed_tests_metadir,
configuration: test_conf,
)
if enable_installed_tests
configure_file(
input: test_template,
output: program[0] + '.test',
install_dir: installed_tests_metadir,
configuration: test_conf,
)
endif
exe = executable(
program[0],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment