Merge pull request #1401 from melMass/python3
Detect if Anaconda and fixed 3d_viewer for Python 3pull/1405/head
commit
c6360ba1ab
|
@ -9,6 +9,10 @@ import ctypes
|
|||
from ctypes import POINTER
|
||||
import operator
|
||||
|
||||
from distutils.sysconfig import get_python_lib
|
||||
import re
|
||||
import sys
|
||||
|
||||
try: import numpy
|
||||
except: numpy = None
|
||||
|
||||
|
@ -26,6 +30,14 @@ if os.name=='posix':
|
|||
additional_dirs.append('/usr/lib/x86_64-linux-gnu')
|
||||
additional_dirs.append('/usr/local/lib/')
|
||||
|
||||
# check if running from anaconda.
|
||||
if "conda" or "continuum" in sys.version.lower():
|
||||
cur_path = get_python_lib()
|
||||
pattern = re.compile('.*\/lib\/')
|
||||
conda_lib = pattern.match(cur_path).group()
|
||||
logger.info("Adding Anaconda lib path:"+ conda_lib)
|
||||
additional_dirs.append(conda_lib)
|
||||
|
||||
# note - this won't catch libassimp.so.N.n, but
|
||||
# currently there's always a symlink called
|
||||
# libassimp.so in /usr/local/lib.
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue