diff options
| author | Eric Engestrom <[email protected]> | 2019-02-14 17:22:00 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-03-05 10:02:47 +0000 |
| commit | e1ee4ab3dcfb73e4975e02e70cc831b5b607d2e0 (patch) | |
| tree | 00978df300af876cc2319429563d5fd8dcef3f27 | |
| parent | dca36d5516d0fdaf012b4476975c5d585c2d1a09 (diff) | |
meson: avoid going back up the tree with include_directories()
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | include/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/meson.build b/include/meson.build index dbae29fe60a..fc2128818c6 100644 --- a/include/meson.build +++ b/include/meson.build @@ -18,6 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +inc_include = include_directories('.') inc_vulkan = include_directories('vulkan') inc_d3d9 = include_directories('D3D9') inc_gl_internal = include_directories('GL/internal') diff --git a/meson.build b/meson.build index 50d2eec97ef..46f86eb0000 100644 --- a/meson.build +++ b/meson.build @@ -1432,8 +1432,6 @@ foreach a : cpp_args add_project_arguments(a, language : ['cpp']) endforeach -inc_include = include_directories('include') - gl_priv_reqs = [] if with_glx == 'xlib' or with_glx == 'gallium-xlib' diff --git a/src/meson.build b/src/meson.build index 60b0d640193..7f537b7094f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -18,8 +18,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -inc_common = include_directories( - '../include', '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary') +inc_common = [inc_include, include_directories( + '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')] inc_mesa = include_directories('mesa') inc_mapi = include_directories('mapi') inc_src = include_directories('.') |