Merge pull request #5578 from mdboom/c-include-path

tacaswell · tacaswell · commit 5bbea40188d1 · 2015-11-30T10:07:57.000-05:00
Fix #5576: Handle CPLUS_INCLUDE_PATH
diff --git a/setupext.py b/setupext.py
@@ -142,7 +142,10 @@ def get_include_dirs():
     """
     Returns a list of standard include directories on this platform.
     """
-    return [os.path.join(d, 'include') for d in get_base_dirs()]
+    include_dirs = [os.path.join(d, 'include') for d in get_base_dirs()]
+    include_dirs.extend(
+        os.environ.get('CPLUS_INCLUDE_PATH', '').split(os.pathsep))
+    return include_dirs
 
 
 def is_min_version(found, minversion):
@@ -463,7 +466,8 @@ def _check_for_pkg_config(self, package, include_file, min_version=None,
             ext = make_extension('test', [])
             pkg_config.setup_extension(ext, package)
 
-        check_include_file(ext.include_dirs, include_file, package)
+        check_include_file(
+            ext.include_dirs + get_include_dirs(), include_file, package)
 
         return 'version %s' % version
 
