Browse Source

Move header to a conventional "include" directory

zrythm_meson
David Robillard 2 years ago
parent
commit
709f5d5b4b
  1. 1
      .clang-tidy
  2. 2
      doc/reference.doxygen.in
  3. 0
      include/sratom/sratom.h
  4. 17
      wscript

1
.clang-tidy

@ -9,7 +9,6 @@ Checks: > @@ -9,7 +9,6 @@ Checks: >
-cert-err34-c,
-clang-analyzer-unix.Malloc,
-hicpp-signed-bitwise,
-llvm-header-guard,
-llvmlibc-*,
-misc-no-recursion,
WarningsAsErrors: '*'

2
doc/reference.doxygen.in

@ -797,7 +797,7 @@ WARN_LOGFILE = @@ -797,7 +797,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
INPUT = @SRATOM_SRCDIR@/sratom/sratom.h \
INPUT = @SRATOM_SRCDIR@/include/sratom/sratom.h \
@SRATOM_SRCDIR@/doc/mainpage.md
# This tag can be used to specify the character encoding of the source files

0
sratom/sratom.h → include/sratom/sratom.h

17
wscript

@ -76,7 +76,10 @@ def configure(conf): @@ -76,7 +76,10 @@ def configure(conf):
conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD')
conf.check_pkg('sord-0 >= 0.14.0', uselib_store='SORD')
autowaf.set_lib_env(conf, 'sratom', SRATOM_VERSION)
# Set up environment for building/using as a subproject
autowaf.set_lib_env(conf, 'sratom', SRATOM_VERSION,
include_path=str(conf.path.find_node('include')))
conf.write_config_header('sratom_config.h', remove=False)
autowaf.display_summary(conf, {'Unit tests': bool(conf.env.BUILD_TESTS)})
@ -106,9 +109,9 @@ def build(bld): @@ -106,9 +109,9 @@ def build(bld):
# Shared Library
if bld.env.BUILD_SHARED:
bld(features = 'c cshlib',
export_includes = ['.'],
export_includes = ['include'],
source = lib_source,
includes = ['.', './src'],
includes = ['include'],
lib = libs,
uselib = 'SERD SORD LV2',
name = 'libsratom',
@ -121,9 +124,9 @@ def build(bld): @@ -121,9 +124,9 @@ def build(bld):
# Static library
if bld.env.BUILD_STATIC:
bld(features = 'c cstlib',
export_includes = ['.'],
export_includes = ['include'],
source = lib_source,
includes = ['.', './src'],
includes = ['include'],
lib = libs,
uselib = 'SERD SORD LV2',
name = 'libsratom_static',
@ -143,7 +146,7 @@ def build(bld): @@ -143,7 +146,7 @@ def build(bld):
# Static library (for unit test code coverage)
bld(features = 'c cstlib',
source = lib_source,
includes = ['.', './src'],
includes = ['include'],
lib = test_libs,
uselib = 'SERD SORD LV2',
name = 'libsratom_profiled',
@ -156,7 +159,7 @@ def build(bld): @@ -156,7 +159,7 @@ def build(bld):
# Unit test program
bld(features = 'c cprogram',
source = 'tests/sratom_test.c',
includes = ['.', './src'],
includes = ['include'],
use = 'libsratom_profiled',
lib = test_libs,
uselib = 'SERD SORD LV2',

Loading…
Cancel
Save