31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
|
|
Ensure that the correct version of Qt is always used.
|
|
|
|
With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
|
|
/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
|
|
|
|
There is no guarantee to which version of Qt these symlinks might point, so it
|
|
is necessary to find the correct version explicitly.
|
|
|
|
Once qmake is found, it is queried for the correct location of all other items.
|
|
|
|
Gentoo-bug: 572382
|
|
|
|
--- a/cmake/modules/FindQt4.cmake
|
|
+++ b/cmake/modules/FindQt4.cmake
|
|
@@ -313,11 +313,10 @@
|
|
|
|
GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
|
|
# check for qmake
|
|
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
|
|
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
|
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
|
|
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
|
|
- $ENV{QTDIR}/bin
|
|
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
|
|
+ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
|
|
+ /usr/bin
|
|
+ NO_DEFAULT_PATH
|
|
)
|
|
|
|
IF (QT_QMAKE_EXECUTABLE)
|