|
|
|
@ -564,6 +564,9 @@ class BuildKControlModule(Command):
|
|
|
|
|
# Qt inc dir
|
|
|
|
|
if self.qt_inc_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtinc = os.getenv("QTINC")
|
|
|
|
|
if qtinc != None:
|
|
|
|
|
canidatepaths.append(qtinc)
|
|
|
|
|
qtdir = os.getenv("QTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,"include"))
|
|
|
|
@ -589,6 +592,9 @@ class BuildKControlModule(Command):
|
|
|
|
|
# Qt lib dir
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtlib = os.getenv("TQTLIB")
|
|
|
|
|
if qtlib != None:
|
|
|
|
|
canidatepaths.append(qtlib)
|
|
|
|
|
qtdir = os.getenv("TQTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
|
|
|
|
@ -602,6 +608,9 @@ class BuildKControlModule(Command):
|
|
|
|
|
self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtlib = os.getenv("QTLIB")
|
|
|
|
|
if qtlib != None:
|
|
|
|
|
canidatepaths.append(qtlib)
|
|
|
|
|
qtdir = os.getenv("QTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
|
|
|
|
@ -651,7 +660,7 @@ class BuildKControlModule(Command):
|
|
|
|
|
|
|
|
|
|
# Find the C library (libgcc, libgcc_s or some other variation).
|
|
|
|
|
if self.clib is None:
|
|
|
|
|
canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ]
|
|
|
|
|
canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ]
|
|
|
|
|
self.clib = FindFileInPaths("libgcc*.so",canidatepaths)
|
|
|
|
|
if self.clib!=None:
|
|
|
|
|
self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
|
|
|
|
@ -1496,6 +1505,9 @@ class BuildKioslave(Command):
|
|
|
|
|
# Qt inc dir
|
|
|
|
|
if self.qt_inc_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtinc = os.getenv("QTINC")
|
|
|
|
|
if qtinc != None:
|
|
|
|
|
canidatepaths.append(qtinc)
|
|
|
|
|
qtdir = os.getenv("QTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,"include"))
|
|
|
|
@ -1519,6 +1531,9 @@ class BuildKioslave(Command):
|
|
|
|
|
# Qt lib dir
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtlib = os.getenv("TQTLIB")
|
|
|
|
|
if qtlib != None:
|
|
|
|
|
canidatepaths.append(qtlib)
|
|
|
|
|
qtdir = os.getenv("TQTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
|
|
|
|
@ -1532,6 +1547,9 @@ class BuildKioslave(Command):
|
|
|
|
|
self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtlib = os.getenv("QTLIB")
|
|
|
|
|
if qtlib != None:
|
|
|
|
|
canidatepaths.append(qtlib)
|
|
|
|
|
qtdir = os.getenv("QTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
|
|
|
|
|