diff options
| -rw-r--r-- | .clang-tidy | 1 | ||||
| -rw-r--r-- | doc/reference.doxygen.in | 2 | ||||
| -rw-r--r-- | include/sratom/sratom.h (renamed from sratom/sratom.h) | 0 | ||||
| -rw-r--r-- | wscript | 17 |
4 files changed, 11 insertions, 9 deletions
diff --git a/.clang-tidy b/.clang-tidy index 34d0485..85eb383 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -9,7 +9,6 @@ Checks: > -cert-err34-c, -clang-analyzer-unix.Malloc, -hicpp-signed-bitwise, - -llvm-header-guard, -llvmlibc-*, -misc-no-recursion, WarningsAsErrors: '*' diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in index ab16c97..79ba064 100644 --- a/doc/reference.doxygen.in +++ b/doc/reference.doxygen.in @@ -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 diff --git a/sratom/sratom.h b/include/sratom/sratom.h index 22cf39e..22cf39e 100644 --- a/sratom/sratom.h +++ b/include/sratom/sratom.h @@ -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): # 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): # 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): # 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): # 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', |