diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2012-06-13 12:03:01 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2012-06-13 12:03:01 +1000 |
| commit | aeb161e17c6eb9257cf2fdd3c704b4518bb9628c (patch) | |
| tree | b6f0ddad161b307e58e6df015a800b6a79f61596 | |
| parent | 7c23631ea875b7226dbf930d55873dfa7b8852e6 (diff) | |
| download | scintilla-mirror-aeb161e17c6eb9257cf2fdd3c704b4518bb9628c.tar.gz | |
Discover name of qmake as it is qmake-qt4 in some distributions of Linux.
| -rw-r--r-- | qt/ScintillaEditPy/sepbuild.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/qt/ScintillaEditPy/sepbuild.py b/qt/ScintillaEditPy/sepbuild.py index b694f15b0..1aa8868b1 100644 --- a/qt/ScintillaEditPy/sepbuild.py +++ b/qt/ScintillaEditPy/sepbuild.py @@ -139,8 +139,15 @@ class SepBuilder: version = f.read() self.ScintillaVersion = version[0] + '.' + version[1] + '.' + version[2] + # Find out what qmake is called + self.QMakeCommand = "qmake" + if not PLAT_WINDOWS: + # On Unix qmake may not be present but qmake-qt4 may be so check + pathToQMake = textFromRun("which qmake-qt4 || which qmake").rstrip() + self.QMakeCommand = os.path.basename(pathToQMake) + # Qt default location from qmake - self._SetQtIncludeBase(textFromRun("qmake -query QT_INSTALL_HEADERS").rstrip()) + self._SetQtIncludeBase(textFromRun(self.QMakeCommand + " -query QT_INSTALL_HEADERS").rstrip()) # PySide default location # No standard for installing PySide development headers and libs on Windows so @@ -232,7 +239,7 @@ class SepBuilder: f.write("CONFIG += release\n") def make(self): - runProgram(["qmake", self.QMakeOptions], exitOnFailure=True) + runProgram([self.QMakeCommand, self.QMakeOptions], exitOnFailure=True) runProgram([self.MakeCommand, self.MakeTarget], exitOnFailure=True) def cleanEverything(self): |