Lubuntu
/
cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c745f424ca'
${ noResults }
cmake/debian/patches/FindQt3.cmake.diff

28 lines
721 B
Raw Normal View History Unescape

Update patches. - FindQt4.cmake2.6.diff - remove, no longer needed as original bug has been fixed since 2.6; - FindQt3.cmake.diff - refresh, add DEP-3 headers; - findmpeg2-addpath.diff - remove, bug fixed upstream (in other way); - kfreebsd-Platform.diff - refresh, add DEP-3 headers; - executables-dont-need-fpic.diff - refresh, app DEP-3 headers; - manpage_friendly_docs.diff - remove, merged upstream; - FindPerlLibs.cmake-perl-5.10.diff - remove, fixed upstream differently; - FindJNI.cmake-more-arches.diff - remove, was taken from upstream; - FindVTK.cmake-vtk-5.4.diff - remove, was taken from upstream.
15 years ago
From: Modestas Vainius <modestas@vainius.eu>
Subject: Prefer *-qt3 binaries to generic names which might come from Qt4
*-qt3 names are Debian specific. Nevertheless, the patch could be applied
upstream.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538864
Prefer *-qt3 binary names to generic ones in FinqQt3.cmake. This closes: #538864.
16 years ago
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
Update patches. - FindQt4.cmake2.6.diff - remove, no longer needed as original bug has been fixed since 2.6; - FindQt3.cmake.diff - refresh, add DEP-3 headers; - findmpeg2-addpath.diff - remove, bug fixed upstream (in other way); - kfreebsd-Platform.diff - refresh, add DEP-3 headers; - executables-dont-need-fpic.diff - refresh, app DEP-3 headers; - manpage_friendly_docs.diff - remove, merged upstream; - FindPerlLibs.cmake-perl-5.10.diff - remove, fixed upstream differently; - FindJNI.cmake-more-arches.diff - remove, was taken from upstream; - FindVTK.cmake-vtk-5.4.diff - remove, was taken from upstream.
15 years ago
@@ -138,7 +138,7 @@
Prefer *-qt3 binary names to generic ones in FinqQt3.cmake. This closes: #538864.
16 years ago
# 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
Update patches. - FindQt4.cmake2.6.diff - remove, no longer needed as original bug has been fixed since 2.6; - FindQt3.cmake.diff - refresh, add DEP-3 headers; - findmpeg2-addpath.diff - remove, bug fixed upstream (in other way); - kfreebsd-Platform.diff - refresh, add DEP-3 headers; - executables-dont-need-fpic.diff - refresh, app DEP-3 headers; - manpage_friendly_docs.diff - remove, merged upstream; - FindPerlLibs.cmake-perl-5.10.diff - remove, fixed upstream differently; - FindJNI.cmake-more-arches.diff - remove, was taken from upstream; - FindVTK.cmake-vtk-5.4.diff - remove, was taken from upstream.
15 years ago
@@ -160,7 +160,8 @@
Prefer *-qt3 binary names to generic ones in FinqQt3.cmake. This closes: #538864.
16 years ago
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