diff options
| author | David Robillard <d@drobilla.net> | 2023-05-27 12:44:32 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2023-05-27 12:44:32 -0400 |
| commit | 5424d37e388fbc68343d05acffaed29b7698dd9c (patch) | |
| tree | 791d432e2838aedea2d95e8330e2794dce7c7c61 | |
| parent | 6514fbd3fd8e72950d0867f2ab1ce14dc44b0371 (diff) | |
| download | pugl-5424d37e388fbc68343d05acffaed29b7698dd9c.tar.gz pugl-5424d37e388fbc68343d05acffaed29b7698dd9c.tar.bz2 pugl-5424d37e388fbc68343d05acffaed29b7698dd9c.zip | |
Use files() for headers in meson
| -rw-r--r-- | bindings/cpp/include/meson.build | 6 | ||||
| -rw-r--r-- | doc/c/xml/meson.build | 2 | ||||
| -rw-r--r-- | doc/cpp/xml/meson.build | 2 | ||||
| -rw-r--r-- | include/meson.build | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/bindings/cpp/include/meson.build b/bindings/cpp/include/meson.build index 3b779f8..2521f8e 100644 --- a/bindings/cpp/include/meson.build +++ b/bindings/cpp/include/meson.build @@ -1,15 +1,13 @@ # Copyright 2021 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -cpp_headers = [ +cpp_headers = files( 'pugl/pugl.hpp', 'pugl/cairo.hpp', 'pugl/gl.hpp', 'pugl/stub.hpp', 'pugl/vulkan.hpp', -] - -cpp_header_files = files(cpp_headers) +) install_headers(cpp_headers, subdir: 'puglpp' + version_suffix / 'pugl') diff --git a/doc/c/xml/meson.build b/doc/c/xml/meson.build index 1c1cddd..8b5e0e2 100644 --- a/doc/c/xml/meson.build +++ b/doc/c/xml/meson.build @@ -14,6 +14,6 @@ c_doxyfile = configure_file( c_index_xml = custom_target( 'c-index.xml', command: [doxygen, '@INPUT0@'], - input: [c_doxyfile] + c_header_files, + input: [c_doxyfile] + c_headers, output: 'index.xml', ) diff --git a/doc/cpp/xml/meson.build b/doc/cpp/xml/meson.build index 4fe1617..72bb8ee 100644 --- a/doc/cpp/xml/meson.build +++ b/doc/cpp/xml/meson.build @@ -14,7 +14,7 @@ cpp_doxyfile = configure_file( cpp_index_xml = custom_target( 'cpp-index.xml', command: [doxygen, '@INPUT0@'], - input: [cpp_doxyfile] + c_header_files + cpp_header_files, + input: [cpp_doxyfile] + c_headers + cpp_headers, output: 'index.xml', ) diff --git a/include/meson.build b/include/meson.build index 00d4aed..20b056f 100644 --- a/include/meson.build +++ b/include/meson.build @@ -1,7 +1,7 @@ # Copyright 2021-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -c_headers = [ +c_headers = files( 'pugl/attributes.h', 'pugl/pugl.h', @@ -10,8 +10,6 @@ c_headers = [ 'pugl/glu.h', 'pugl/stub.h', 'pugl/vulkan.h', -] - -c_header_files = files(c_headers) +) install_headers(c_headers, subdir: versioned_name / 'pugl') |