|
Line
Link Here
|
| 0 |
-- a/cmake/modules/FindQt4.cmake |
0 |
++ b/cmake/modules/FindQt4.cmake |
|
Lines 446-451
GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
Link Here
|
| 446 |
# check for qmake |
446 |
# check for qmake |
| 447 |
# Debian uses qmake-qt4 |
447 |
# Debian uses qmake-qt4 |
| 448 |
# macports' Qt uses qmake-mac |
448 |
# macports' Qt uses qmake-mac |
|
|
449 |
if(CMAKE_BUILD_TYPE STREQUAL Gentoo) |
| 450 |
find_program(QT_QMAKE_EXECUTABLE NAMES qmake |
| 451 |
PATHS |
| 452 |
$ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin |
| 453 |
$ENV{EPREFIX}/usr/bin |
| 454 |
NO_DEFAULT_PATH |
| 455 |
DOC "The qmake executable for the Qt installation to use" |
| 456 |
) |
| 457 |
else() |
| 449 |
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS |
458 |
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS |
| 450 |
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" |
459 |
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" |
| 451 |
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" |
460 |
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" |
|
Lines 453-458
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
Link Here
|
| 453 |
$ENV{QTDIR}/bin |
462 |
$ENV{QTDIR}/bin |
| 454 |
DOC "The qmake executable for the Qt installation to use" |
463 |
DOC "The qmake executable for the Qt installation to use" |
| 455 |
) |
464 |
) |
|
|
465 |
endif() |
| 456 |
|
466 |
|
| 457 |
IF (QT_QMAKE_EXECUTABLE) |
467 |
IF (QT_QMAKE_EXECUTABLE) |
| 458 |
|
468 |
|
