fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 16:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: avoid going back up the tree with include_directories()

Browse source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Eric Engestrom 2019-02-14 17:22:00 +00:00
parent dca36d5516
commit e1ee4ab3dc
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/meson.build
View file

@ -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')

2
meson.build
View file

@ -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'

4
src/meson.build
View file

@ -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('.')