diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-10-11 04:26:35 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-10-11 04:36:09 +1100 |
| commit | 0ee1361bd482a7f8fb88b72c8975fdaebc4c4348 (patch) | |
| tree | 561417590b1e574df18b5d01af4b553a62a7562f /dev-util/cmake/files | |
| parent | app-crypt/gnupg: Add ~sparc keyword wrt bug #546478 (diff) | |
| download | gentoo-0ee1361bd482a7f8fb88b72c8975fdaebc4c4348.tar.gz gentoo-0ee1361bd482a7f8fb88b72c8975fdaebc4c4348.tar.bz2 gentoo-0ee1361bd482a7f8fb88b72c8975fdaebc4c4348.zip | |
dev-util/cmake: add patch to ensure the correct version of Qt is always used
Gentoo-bug: 547222
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.3.2-FindQt4.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch new file mode 100644 index 000000000000..665c3304111f --- /dev/null +++ b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch @@ -0,0 +1,45 @@ +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: 547222 + +--- Modules/FindQt4.cmake ++++ Modules/FindQt4.cmake +@@ -482,13 +482,23 @@ + + get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) + +- find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} +- PATHS +- ENV QTDIR +- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" +- PATH_SUFFIXES bin +- DOC "The qmake executable for the Qt installation to use" +- ) ++ if(CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} ++ PATHS ++ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin ++ /usr/bin ++ NO_DEFAULT_PATH ++ DOC "The qmake executable for the Qt installation to use" ++ ) ++ else() ++ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} ++ PATHS ++ ENV QTDIR ++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" ++ PATH_SUFFIXES bin ++ DOC "The qmake executable for the Qt installation to use" ++ ) ++ endif() + + set(major 0) + if (QT_QMAKE_EXECUTABLE) |