Prefer *-qt3 binary names to generic ones in FinqQt3.cmake.
This closes: #538864.
This commit is contained in:
parent
dab02991b2
commit
e22f8f344b
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
|||||||
|
cmake (2.6.4-2) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
* Prefer *-qt3 binary names to generic ones in FinqQt3.cmake
|
||||||
|
(Closes: #538864).
|
||||||
|
|
||||||
|
-- Modestas Vainius <modestas@vainius.eu> Sat, 08 Aug 2009 10:34:21 +0300
|
||||||
|
|
||||||
cmake (2.6.4-1) unstable; urgency=low
|
cmake (2.6.4-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
|
23
debian/patches/FindQt3.cmake.diff
vendored
Normal file
23
debian/patches/FindQt3.cmake.diff
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
Prefer *-qt3 binaries to generic names which might come from Qt4
|
||||||
|
|
||||||
|
--- a/Modules/FindQt3.cmake
|
||||||
|
+++ b/Modules/FindQt3.cmake
|
||||||
|
@@ -125,7 +125,7 @@
|
||||||
|
|
||||||
|
# qt 3 should prefer QTDIR over the PATH
|
||||||
|
FIND_PROGRAM(QT_MOC_EXECUTABLE
|
||||||
|
- NAMES moc moc-qt3
|
||||||
|
+ NAMES moc-qt3 moc
|
||||||
|
HINTS
|
||||||
|
$ENV{QTDIR}/bin
|
||||||
|
PATHS
|
||||||
|
@@ -147,7 +147,8 @@
|
||||||
|
ENDIF(QT_MOC_EXECUTABLE)
|
||||||
|
|
||||||
|
# qt 3 should prefer QTDIR over the PATH
|
||||||
|
-FIND_PROGRAM(QT_UIC_EXECUTABLE uic
|
||||||
|
+FIND_PROGRAM(QT_UIC_EXECUTABLE
|
||||||
|
+ NAMES uic-qt3 uic
|
||||||
|
HINTS
|
||||||
|
$ENV{QTDIR}/bin
|
||||||
|
PATHS
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,4 +1,5 @@
|
|||||||
FindQt4.cmake2.6.diff
|
FindQt4.cmake2.6.diff
|
||||||
|
FindQt3.cmake.diff
|
||||||
findmpeg2-addpath.diff
|
findmpeg2-addpath.diff
|
||||||
kfreebsd-Platform.diff
|
kfreebsd-Platform.diff
|
||||||
executables-dont-need-fpic.diff
|
executables-dont-need-fpic.diff
|
||||||
|
Loading…
x
Reference in New Issue
Block a user