瀏覽代碼

Support searching in custom inc directories

rdb 16 年之前
父節點
當前提交
3f0beb2537
共有 1 個文件被更改,包括 4 次插入0 次删除
  1. 4 0
      makepanda/makepandacore.py

+ 4 - 0
makepanda/makepandacore.py

@@ -1015,6 +1015,10 @@ def PkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None, fram
             elif (platform.uname()[1]=="pcbsd" and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0):
             elif (platform.uname()[1]=="pcbsd" and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0):
                 incdir = sorted(glob.glob("/usr/PCBSD/local/include/" + i))[-1]
                 incdir = sorted(glob.glob("/usr/PCBSD/local/include/" + i))[-1]
             else:
             else:
+                # Try searching in the package's IncDirectories.
+                for ppkg, pdir in INCDIRECTORIES:
+                    if (pkg == ppkg and len(glob.glob(os.path.join(pdir, i))) > 0):
+                        incdir = sorted(glob.glob(os.path.join(pdir, i)))
                 if (VERBOSE and i.endswith(".h")):
                 if (VERBOSE and i.endswith(".h")):
                     print GetColor("cyan") + "Couldn't find header file " + i + GetColor()
                     print GetColor("cyan") + "Couldn't find header file " + i + GetColor()
                 have_pkg = False
                 have_pkg = False