From 3435540b4e7c8abc1f27c63dba97ae7f4b96e783 Mon Sep 17 00:00:00 2001
From: Quartenia <quarte1994@gmail.com>
Date: Wed, 15 Dec 2021 17:43:26 +0100
Subject: [PATCH] removed building GUI added paths to conda python

---
 build/SConscript.configure  | 16 ++++++++--------
 data/scons/detect_python.py | 11 +++++++++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/build/SConscript.configure b/build/SConscript.configure
index fe9a2502..9c3e26d7 100644
--- a/build/SConscript.configure
+++ b/build/SConscript.configure
@@ -92,14 +92,14 @@ vars.Add('QTDIR',           'Qt installation directory')
 vars.Add('QTINCLUDE',       'Additional Qt include directory')
 vars.Add('INTEL_COMPILER',  'Should the Intel C++ compiler be used?')
 
-try:
-        env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt5'], toolpath=['#data/scons'])
-        print 'Checking for Qt 5.x... yes'
-        hasQt = True
-except Exception:
-        env = Environment(options=vars, ENV = os.environ, tools=['default'], toolpath=['#data/scons'])
-        print 'Unable to detect a Qt installation -- not building the GUI!'
-        hasQt = False
+#try:
+#        env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt5'], toolpath=['#data/scons'])
+#        print 'Checking for Qt 5.x... yes'
+#        hasQt = True
+#except Exception:
+env = Environment(options=vars, ENV = os.environ, tools=['default'], toolpath=['#data/scons'])
+print 'Unable to detect a Qt installation -- not building the GUI!'
+hasQt = False
 
 hasCollada=True
 hasPython = []
diff --git a/data/scons/detect_python.py b/data/scons/detect_python.py
index f2c9fa33..9b1f71cc 100644
--- a/data/scons/detect_python.py
+++ b/data/scons/detect_python.py
@@ -5,7 +5,9 @@ class PkgConfig(dict):
     _paths = [
         '/usr/lib/pkgconfig',
         '/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):
@@ -42,9 +44,12 @@ def find_boost_python(version):
     libnames = [
         'boost_python-mt-py%s' % version,
         'boost_python-py%s' % version,
+        'boost_python%s' % version,
         'boost_python' + ('3' if version.startswith('3') else '')
     ]
     basepaths = [
+        '/root/miniconda3/lib/',
+        '/root/anaconda3/lib/',
         '/usr/lib',
         '/usr/lib/%s-linux-gnu' % (os.uname()[4]),
         '/usr/lib%i' % (struct.calcsize('P')*8)
@@ -57,7 +62,7 @@ def find_boost_python(version):
     return None
 
 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 = {}
 
     for version in pyver:
@@ -83,6 +88,8 @@ def detect_python():
                 pyenv['PYTHON' + version + 'LIBDIR'] += [flag[2:]]
             elif flag.startswith('-l'):
                 pyenv['PYTHON' + version + 'LIB'] += [flag[2:]]
+    print('found some boost python')
+    print(pyenv)
     return pyenv
 
 if __name__ == '__main__':