Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a385d33

Browse filesBrowse files
committed
Merge pull request #5578 from mdboom/c-include-path
Fix #5576: Handle CPLUS_INCLUDE_PATH
1 parent aceb626 commit a385d33
Copy full SHA for a385d33

File tree

Expand file treeCollapse file tree

1 file changed

+6
-2
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-2
lines changed

‎setupext.py

Copy file name to clipboardExpand all lines: setupext.py
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,10 @@ def get_include_dirs():
163163
"""
164164
Returns a list of standard include directories on this platform.
165165
"""
166-
return [os.path.join(d, 'include') for d in get_base_dirs()]
166+
include_dirs = [os.path.join(d, 'include') for d in get_base_dirs()]
167+
include_dirs.extend(
168+
os.environ.get('CPLUS_INCLUDE_PATH', '').split(os.pathsep))
169+
return include_dirs
167170

168171

169172
def is_min_version(found, minversion):
@@ -469,7 +472,8 @@ def _check_for_pkg_config(self, package, include_file, min_version=None,
469472
ext = make_extension('test', [])
470473
pkg_config.setup_extension(ext, package)
471474

472-
check_include_file(ext.include_dirs, include_file, package)
475+
check_include_file(
476+
ext.include_dirs + get_include_dirs(), include_file, package)
473477

474478
return 'version %s' % version
475479

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.