Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 414218 Details for
Bug 547222
dev-util/cmake: FindQt4.cmake calls qmake directly
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
cmake-3.3.2-qmake.patch
cmake-3.3.2-qmake.patch (text/plain), 1.07 KB, created by
Michael Palimaka (kensington)
on 2015-10-09 17:02:00 UTC
(
hide
)
Description:
cmake-3.3.2-qmake.patch
Filename:
MIME Type:
Creator:
Michael Palimaka (kensington)
Created:
2015-10-09 17:02:00 UTC
Size:
1.07 KB
patch
obsolete
>--- Modules/FindQt4.cmake >+++ Modules/FindQt4.cmake >@@ -482,13 +482,24 @@ > > 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/lib/qt4/bin >+ /usr/lib64/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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 547222
:
414218
|
414256