diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-10 14:33:10 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-10 14:33:10 (GMT) |
| commit | f8c259b443c95d2fce7f0ed7fd75e1acaf69b056 (patch) | |
| tree | 0d8ef44beb84d7a2009418e44bc257f60b699bde /Modules | |
| parent | e6cb2ee6c495dab8d7af5a76af958d3cc87ebb86 (diff) | |
| download | CMake-f8c259b443c95d2fce7f0ed7fd75e1acaf69b056.zip CMake-f8c259b443c95d2fce7f0ed7fd75e1acaf69b056.tar.gz CMake-f8c259b443c95d2fce7f0ed7fd75e1acaf69b056.tar.bz2 | |
BUG: try to fix qt problems
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 5b30cd0..5aab2d4 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -116,10 +116,14 @@ IF(DESIRED_QT_VERSION MATCHES 4) ENDIF(DESIRED_QT_VERSION MATCHES 4) IF(NOT QT3_INSTALLED AND NOT QT4_INSTALLED) - MESSAGE(SEND_ERROR "CMake was unable to find any QT versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.") + IF(QT_REQUIRED) + MESSAGE(SEND_ERROR "CMake was unable to find any QT versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.") + ENDIF(QT_REQUIRED) ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED) IF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION) - MESSAGE(SEND_ERROR "Multiple versions of QT found please set DESIRED_QT_VERSION") + IF(QT_REQUIRED) + MESSAGE(SEND_ERROR "Multiple versions of QT found please set DESIRED_QT_VERSION") + ENDIF(QT_REQUIRED) ENDIF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION) IF(NOT QT_FOUND AND DESIRED_QT_VERSION) MESSAGE(SEND_ERROR "CMake was unable to find QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.") |