diff options
| author |   Johannes Huber <johu@gentoo.org> | 2016-07-15 07:40:48 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2016-07-15 07:41:08 +0200 |
| commit | f966538219d8d85fa903bec626e122b5f8cdbceb (patch) | |
| tree | 53d7bc9242f1801fe7f9e912db387cc739fd8738 /dev-util/cmake/files | |
| parent | dev-ruby/stringex: add ruby23 (diff) | |
| download | gentoo-f966538219d8d85fa903bec626e122b5f8cdbceb.tar.gz gentoo-f966538219d8d85fa903bec626e122b5f8cdbceb.tar.bz2 gentoo-f966538219d8d85fa903bec626e122b5f8cdbceb.zip | |
dev-util/cmake: Remove 3.3.2, 3.4.3
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.3.2-FindQt4.patch | 45 |
1 files changed, 0 insertions, 45 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 deleted file mode 100644 index 31e4db3c5bb3..000000000000 --- a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - ---- a/Modules/FindQt4.cmake -+++ b/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) |