Unverified Commit cfd49927 authored by Kip's avatar Kip Committed by GitHub

Merge pull request #979 from Tachi107/remove-include-meson.build

meson: small improvements
parents 918a95d5 ec2d8160
# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
#
# SPDX-License-Identifier: Apache-2.0
subdir('pistache')
...@@ -88,7 +88,7 @@ if meson.version().version_compare('>=0.57.0') ...@@ -88,7 +88,7 @@ if meson.version().version_compare('>=0.57.0')
else else
# Ugly workaround for reading a file # Ugly workaround for reading a file
version_data_raw = run_command( version_data_raw = run_command(
find_program('python3'), '-c', 'print(open("version.txt").read())' import('python').find_installation(), '-c', 'print(open("version.txt").read())'
).stdout().strip().split('\n') ).stdout().strip().split('\n')
endif endif
version_data_conf = configuration_data() version_data_conf = configuration_data()
...@@ -104,7 +104,7 @@ pistache_soversion_str = '.'.join([version_data_conf.get_unquoted('SONAME_VERSIO ...@@ -104,7 +104,7 @@ pistache_soversion_str = '.'.join([version_data_conf.get_unquoted('SONAME_VERSIO
incl_pistache = include_directories('include') incl_pistache = include_directories('include')
subdir('include') subdir('include'/'pistache')
subdir('src') subdir('src')
if get_option('PISTACHE_BUILD_TESTS') if get_option('PISTACHE_BUILD_TESTS')
subdir('tests') subdir('tests')
......
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