OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made python library and header detection more robust

This commit is contained in:
Davis King 2017-01-16 06:54:20 -05:00
parent 7cf1a9282b
commit 5f5684a8fb
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
setup.py
View File

@ -505,10 +505,12 @@ class build(_build):
# make sure build artifacts are generated for the version of Python currently running # make sure build artifacts are generated for the version of Python currently running
cmake_extra_arch = [] cmake_extra_arch = []
from distutils.sysconfig import get_python_inc inc_dir = get_python_inc()
import distutils.sysconfig as sysconfig lib_dir = get_config_var('LIBDIR')
cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR=' + get_python_inc()] if (inc_dir != None):
cmake_extra_arch += ['-DPYTHON_LIBRARY=' + sysconfig.get_config_var('LIBDIR')] cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR=' + inc_dir]
if (lib_dir != None):
cmake_extra_arch += ['-DCMAKE_LIBRARY_PATH=' + lib_dir]
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
cmake_extra_arch += ['-DPYTHON3=yes'] cmake_extra_arch += ['-DPYTHON3=yes']
@ -516,8 +518,6 @@ class build(_build):
log.info("Detected platform: %s" % sys.platform) log.info("Detected platform: %s" % sys.platform)
if sys.platform == "darwin": if sys.platform == "darwin":
# build on OS X # build on OS X
inc_dir = get_python_inc()
cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR={inc}'.format(inc=inc_dir)]
# by default, cmake will choose the system python lib in /usr/lib # by default, cmake will choose the system python lib in /usr/lib
# this checks the sysconfig and will correctly pick up a brewed python lib # this checks the sysconfig and will correctly pick up a brewed python lib
@ -530,8 +530,6 @@ class build(_build):
if platform_arch == '64bit' and not generator_set: if platform_arch == '64bit' and not generator_set:
cmake_extra_arch += get_msvc_win64_generator() cmake_extra_arch += get_msvc_win64_generator()
inc_dir = get_python_inc()
cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR={inc}'.format(inc=inc_dir)]
# this imitates cmake in path resolution # this imitates cmake in path resolution
py_ver = get_python_version() py_ver = get_python_version()
for ext in [py_ver.replace(".", "") + '.lib', py_ver + 'mu.lib', py_ver + 'm.lib', py_ver + 'u.lib']: for ext in [py_ver.replace(".", "") + '.lib', py_ver + 'mu.lib', py_ver + 'm.lib', py_ver + 'u.lib']: