[cig-commits] commit: Searching multiple header paths.

[Mercurial]

changeset:   72:7cc44e193c2a
user:        LukeHodkinson
date:        Thu Apr 10 02:24:11 2008 +0000
files:       config/SConfig/Package.py config/SConfig/packages/MPI.py config/SConfig/packages/OpenGL.py config/SConfig/packages/PETSc.py config/SConfig/packages/PETScExt.py config/SConfig/packages/SDL.py config/SConfig/packages/X11.py config/SConfig/packages/libXML2.py config/SConfig/packages/libavcodec.py
description:
Searching multiple header paths.


diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/Package.py
--- a/config/SConfig/Package.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/Package.py	Thu Apr 10 02:24:11 2008 +0000
@@ -13,7 +13,7 @@ class Package(SConfig.Node):
         self.base_dirs           = [] #['']
         self.base_patterns       = [] #['']
         self.sub_dirs            = [] #[[[''], ['']]]
-        self.header_sub_dir      = ''
+        self.header_sub_dir      = [] #['']
         self.system_header_dirs  = []
         self.system_library_dirs = []
 
@@ -360,12 +360,13 @@ int main(int argc, char* argv[]) {
     def combine_header_sub_dir(self, base_dir, hdr_dirs):
         if not self.header_sub_dir or not hdr_dirs:
             return
-        cand = [os.path.join(h, self.header_sub_dir) for h in hdr_dirs if h]
-        for d in cand:
-            path = os.path.join(base_dir, d)
-            if not (os.path.exists(path) and os.path.isdir(path)):
-                return
-        yield cand
+        for sub_dir in self.header_sub_dir:
+            cand = [os.path.join(h, sub_dir) for h in hdr_dirs if h]
+            for d in cand:
+                path = os.path.join(base_dir, d)
+                if not (os.path.exists(path) and os.path.isdir(path)):
+                    return
+            yield cand
 
     def join_sub_dir(self, base_dir, sub_dir):
         if os.path.isabs(sub_dir):
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/MPI.py
--- a/config/SConfig/packages/MPI.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/MPI.py	Thu Apr 10 02:24:11 2008 +0000
@@ -6,7 +6,7 @@ class MPI(SConfig.Package):
         SConfig.Package.__init__(self, scons_env, scons_opts, required)
         self.dependency(SConfig.packages.CompilerFlags)
         self.base_patterns = ['mpich*', 'MPICH*']
-        self.header_sub_dir = 'mpi'
+        self.header_sub_dir = ['mpi']
         self.headers = [['mpi.h']]
         self.libraries = [['mpich'],
                           ['mpich', 'pmpich'],
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/OpenGL.py
--- a/config/SConfig/packages/OpenGL.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/OpenGL.py	Thu Apr 10 02:24:11 2008 +0000
@@ -4,7 +4,7 @@ class OpenGL(SConfig.Package):
 class OpenGL(SConfig.Package):
     def __init__(self, scons_env, scons_opts, required=False, **kw):
         SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
-        self.header_sub_dir = 'GL'
+        self.header_sub_dir = ['GL']
         self.headers = [['gl.h', 'glu.h']]
         self.libraries = [['GL', 'GLU']]
         self.frameworks = [['OpenGL']]
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/PETSc.py
--- a/config/SConfig/packages/PETSc.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/PETSc.py	Thu Apr 10 02:24:11 2008 +0000
@@ -6,7 +6,7 @@ class PETSc(SConfig.Package):
         SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
         self.dependency(SConfig.packages.MPI)
         self.base_patterns = ['petsc*', 'PETSC*', 'PETSc*']
-        self.header_sub_dir = 'petsc'
+        self.header_sub_dir = ['petsc']
         self.headers = [['petsc.h',
                          'petscvec.h', 'petscmat.h',
                          'petscksp.h', 'petscsnes.h']]
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/PETScExt.py
--- a/config/SConfig/packages/PETScExt.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/PETScExt.py	Thu Apr 10 02:24:11 2008 +0000
@@ -6,7 +6,7 @@ class PETScExt(SConfig.Package):
         SConfig.Package.__init__(self, scons_env, scons_opts, required)
         self.pkg_petsc = self.dependency(SConfig.packages.PETSc)
         self.base_patterns = ['petscext*', 'PETSCEXT*', 'PETScExt*']
-        self.header_sub_dir = 'petsc'
+        self.header_sub_dir = ['petsc']
         self.headers = [['petscext.h',
                          'petscext_vec.h', 'petscext_mat.h',
                          'petscext_ksp.h', 'petscext_snes.h']]
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/SDL.py
--- a/config/SConfig/packages/SDL.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/SDL.py	Thu Apr 10 02:24:11 2008 +0000
@@ -4,7 +4,7 @@ class SDL(SConfig.Package):
 class SDL(SConfig.Package):
     def __init__(self, scons_env, scons_opts, required=False, **kw):
         SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
-        self.header_sub_dir = 'SDL'
+        self.header_sub_dir = ['SDL']
         self.headers = [['SDL.h'],
                         ['SDL/SDL.h']] # For framework.
         self.libraries = [['SDL']]
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/X11.py
--- a/config/SConfig/packages/X11.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/X11.py	Thu Apr 10 02:24:11 2008 +0000
@@ -4,7 +4,7 @@ class X11(SConfig.Package):
 class X11(SConfig.Package):
     def __init__(self, scons_env, scons_opts, required=False, **kw):
         SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
-        self.header_sub_dir = 'X11'
+        self.header_sub_dir = ['X11', 'X11R6']
         self.headers = [['Xlib.h']]
         self.libraries = [['X11', 'Xmu']]
         self.symbols = [(['XOpenDisplay'], '')]
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/libXML2.py
--- a/config/SConfig/packages/libXML2.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/libXML2.py	Thu Apr 10 02:24:11 2008 +0000
@@ -5,6 +5,6 @@ class libXML2(SConfig.Package):
     def __init__(self, scons_env, scons_opts, required=False):
         SConfig.Package.__init__(self, scons_env, scons_opts, required)
         self.dependency(SConfig.packages.CompilerFlags)
-        self.header_sub_dir = 'libxml2'
+        self.header_sub_dir = ['libxml2']
         self.headers = [[os.path.join('libxml', 'parser.h')]]
         self.libraries = [['xml2']]
diff -r bd2e29a7b9cd -r 7cc44e193c2a config/SConfig/packages/libavcodec.py
--- a/config/SConfig/packages/libavcodec.py	Thu Apr 10 01:46:44 2008 +0000
+++ b/config/SConfig/packages/libavcodec.py	Thu Apr 10 02:24:11 2008 +0000
@@ -4,7 +4,7 @@ class libavcodec(SConfig.Package):
 class libavcodec(SConfig.Package):
     def __init__(self, scons_env, scons_opts, required=False, **kw):
         SConfig.Package.__init__(self, scons_env, scons_opts, required, **kw)
-        self.header_sub_dir = 'ffmpeg'
+        self.header_sub_dir = ['ffmpeg']
         self.headers = [['avcodec.h']]
         self.libraries = [['avcodec']]
         self.have_define = 'HAVE_AVCODEC'