From 1c74e7f7bf8ecb9ea29fc7ed83fe2ba1c3acfe73 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 12 Apr 2013 15:10:00 +0000 Subject: [PATCH] pick up ode-config include fix on head --- makepanda/makepandacore.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index e19f774bc4..de5e14351c 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1322,11 +1322,14 @@ def PkgConfigGetIncDirs(pkgname, tool = "pkg-config"): result = handle.read().strip() if len(result) == 0: return [] handle.close() - libs = [] - for l in result.split(" "): - if (l.startswith("-I")): - libs.append(l.replace("-I", "").replace("\"", "").strip()) - return libs + dirs = [] + for opt in result.split(" "): + if (opt.startswith("-I")): + inc_dir = opt.replace("-I", "").replace("\"", "").strip() + # Hack for ODE, otherwise -S/usr/include gets added to interrogate + if inc_dir != '/usr/include' or inc_dir != '/usr/include/': + dirs.append(inc_dir) + return dirs def PkgConfigGetLibDirs(pkgname, tool = "pkg-config"): """Returns a list of library paths for the package, NOT prefixed by -L."""