prenek missing X.h (#8121)

This commit is contained in:
Cameron Smith 2018-05-14 19:19:46 -04:00 committed by Adam J. Stewart
parent 34a2d35e50
commit 3a7fadd67e

View file

@ -85,6 +85,7 @@ class Nek5000(Package):
depends_on('libx11', when="+postnek") depends_on('libx11', when="+postnek")
# libxt is needed for X11/Intrinsic.h but not for linking # libxt is needed for X11/Intrinsic.h but not for linking
depends_on('libxt', when="+prenek") depends_on('libxt', when="+prenek")
depends_on('xproto', when="+prenek")
depends_on('libxt', when="+postnek") depends_on('libxt', when="+postnek")
depends_on('visit', when="+visit") depends_on('visit', when="+visit")
@ -125,6 +126,14 @@ def install(self, spec, prefix):
raise RuntimeError('Xlib.h not found in %s' % raise RuntimeError('Xlib.h not found in %s' %
spec['libx11'].prefix.include) spec['libx11'].prefix.include)
cflags += ['-I%s' % os.path.dirname(libx11_h.directories[0])] cflags += ['-I%s' % os.path.dirname(libx11_h.directories[0])]
xproto_h = find_headers('X', spec['xproto'].prefix.include,
recursive=True)
if not xproto_h:
raise RuntimeError('X.h not found in %s' %
spec['xproto'].prefix.include)
cflags += ['-I%s' % os.path.dirname(xproto_h.directories[0])]
libxt_h = find_headers('Intrinsic', spec['libxt'].prefix.include, libxt_h = find_headers('Intrinsic', spec['libxt'].prefix.include,
recursive=True) recursive=True)
if not libxt_h: if not libxt_h: