mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed building GUI added paths to conda python

master
Quartenia 2021-12-15 17:43:26 +01:00
parent cfeb7766e7
commit 3435540b4e
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/SConscript.configure
View File

@ -92,14 +92,14 @@ vars.Add('QTDIR', 'Qt installation directory')
vars.Add('QTINCLUDE', 'Additional Qt include directory') vars.Add('QTINCLUDE', 'Additional Qt include directory')
vars.Add('INTEL_COMPILER', 'Should the Intel C++ compiler be used?') vars.Add('INTEL_COMPILER', 'Should the Intel C++ compiler be used?')
try: #try:
env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt5'], toolpath=['#data/scons']) # env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt5'], toolpath=['#data/scons'])
print 'Checking for Qt 5.x... yes' # print 'Checking for Qt 5.x... yes'
hasQt = True # hasQt = True
except Exception: #except Exception:
env = Environment(options=vars, ENV = os.environ, tools=['default'], toolpath=['#data/scons']) env = Environment(options=vars, ENV = os.environ, tools=['default'], toolpath=['#data/scons'])
print 'Unable to detect a Qt installation -- not building the GUI!' print 'Unable to detect a Qt installation -- not building the GUI!'
hasQt = False hasQt = False
hasCollada=True hasCollada=True
hasPython = [] hasPython = []

11
data/scons/detect_python.py
View File

@ -5,7 +5,9 @@ class PkgConfig(dict):
_paths = [ _paths = [
'/usr/lib/pkgconfig', '/usr/lib/pkgconfig',
'/usr/lib/%s-linux-gnu/pkgconfig' % (os.uname()[4]), '/usr/lib/%s-linux-gnu/pkgconfig' % (os.uname()[4]),
'/usr/lib%i/pkgconfig' % (struct.calcsize('P')*8) '/usr/lib%i/pkgconfig' % (struct.calcsize('P')*8),
'/root/miniconda3/lib/pkgconfig',
'/root/anaconda3/lib/pkgconfig'
] ]
def __init__(self, name): def __init__(self, name):
@ -42,9 +44,12 @@ def find_boost_python(version):
libnames = [ libnames = [
'boost_python-mt-py%s' % version, 'boost_python-mt-py%s' % version,
'boost_python-py%s' % version, 'boost_python-py%s' % version,
'boost_python%s' % version,
'boost_python' + ('3' if version.startswith('3') else '') 'boost_python' + ('3' if version.startswith('3') else '')
] ]
basepaths = [ basepaths = [
'/root/miniconda3/lib/',
'/root/anaconda3/lib/',
'/usr/lib', '/usr/lib',
'/usr/lib/%s-linux-gnu' % (os.uname()[4]), '/usr/lib/%s-linux-gnu' % (os.uname()[4]),
'/usr/lib%i' % (struct.calcsize('P')*8) '/usr/lib%i' % (struct.calcsize('P')*8)
@ -57,7 +62,7 @@ def find_boost_python(version):
return None return None
def detect_python(): def detect_python():
pyver = ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] pyver = ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7']
pyenv = {} pyenv = {}
for version in pyver: for version in pyver:
@ -83,6 +88,8 @@ def detect_python():
pyenv['PYTHON' + version + 'LIBDIR'] += [flag[2:]] pyenv['PYTHON' + version + 'LIBDIR'] += [flag[2:]]
elif flag.startswith('-l'): elif flag.startswith('-l'):
pyenv['PYTHON' + version + 'LIB'] += [flag[2:]] pyenv['PYTHON' + version + 'LIB'] += [flag[2:]]
print('found some boost python')
print(pyenv)
return pyenv return pyenv
if __name__ == '__main__': if __name__ == '__main__':