diff options
| author | xoviat <xoviat@users.noreply.github.com> | 2017-10-14 18:27:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 18:27:45 -0500 |
| commit | bd502bbbc9dde146f1da25612ace7b1c196dd837 (patch) | |
| tree | b4f7cf33404bdb617e6f3f746b1d597adc17bb6c | |
| parent | ea083bdbd39d37023f7ab7b366d5a9cd0d9707b2 (diff) | |
| download | numpy-bd502bbbc9dde146f1da25612ace7b1c196dd837.tar.gz | |
MAINT: make vcpkg include directories more clear
| -rw-r--r-- | numpy/distutils/system_info.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 1548d8e20..01d547d8e 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -211,7 +211,13 @@ if sys.platform == 'win32': default_src_dirs = ['.'] default_x11_lib_dirs = [] default_x11_include_dirs = [] - + vcpkg_include_dirs = [ + 'include', + 'include/suitesparse', + ] + vcpkg_lib_dirs = [ + 'lib', + ] if sys.version_info >= (3, 3): # VCpkg is the de-facto package manager on windows for C/C++ # libraries. If it is on the PATH, then we append its paths here. @@ -227,8 +233,12 @@ if sys.platform == 'win32': vcpkg_root = os.path.join( vcpkg_dir, 'installed', specifier + '-windows') - default_lib_dirs.append(os.path.join(vcpkg_root, 'lib')) - default_include_dirs.append(os.path.join(vcpkg_root, 'include')) + default_lib_dirs.extend( + os.path.join( + vcpkg_root, d.replace('/', os.sep)) for d in vcpkg_lib_dirs) + default_include_dirs.extend( + os.path.join( + vcpkg_root, d.replace('/', os.sep)) for d in vcpkg_include_dirs) else: default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', '/opt/local/lib', '/sw/lib'], platform_bits) |