diff options
| author | David Cole <david.cole@kitware.com> | 2012-12-11 18:43:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-12-11 18:43:36 (GMT) |
| commit | d73c4057edeca78fcefbcaf9fd3768e2c0e19e07 (patch) | |
| tree | d5f374274f561188419501e52bd85dee191b4d71 /Modules/FindQt4.cmake | |
| parent | ab2b1f44f88dd82129bcfe7f96007c30e1e07d08 (diff) | |
| parent | f80ccac158c11b21319e6f4a82137bcc88f0dfaf (diff) | |
| download | CMake-d73c4057edeca78fcefbcaf9fd3768e2c0e19e07.zip CMake-d73c4057edeca78fcefbcaf9fd3768e2c0e19e07.tar.gz CMake-d73c4057edeca78fcefbcaf9fd3768e2c0e19e07.tar.bz2 | |
Merge topic 'OpenBSD-patches'
f80ccac OpenBSD: Add paths for Qt3/Qt4
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 00e86e8..ea4d8f4 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -986,13 +986,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) endif() find_program(QT_MOC_EXECUTABLE - NAMES moc-qt4 moc + NAMES moc-qt4 moc moc4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) find_program(QT_UIC_EXECUTABLE - NAMES uic-qt4 uic + NAMES uic-qt4 uic uic4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) @@ -1022,13 +1022,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) ) find_program(QT_LUPDATE_EXECUTABLE - NAMES lupdate-qt4 lupdate + NAMES lupdate-qt4 lupdate lupdate4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) find_program(QT_LRELEASE_EXECUTABLE - NAMES lrelease-qt4 lrelease + NAMES lrelease-qt4 lrelease lrelease4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) @@ -1040,13 +1040,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) ) find_program(QT_DESIGNER_EXECUTABLE - NAMES designer-qt4 designer + NAMES designer-qt4 designer designer4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) find_program(QT_LINGUIST_EXECUTABLE - NAMES linguist-qt4 linguist + NAMES linguist-qt4 linguist linguist4 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) |