|
@@ -116,10 +116,14 @@ IF(DESIRED_QT_VERSION MATCHES 4)
|
|
|
ENDIF(DESIRED_QT_VERSION MATCHES 4)
|
|
ENDIF(DESIRED_QT_VERSION MATCHES 4)
|
|
|
|
|
|
|
|
IF(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
|
|
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)
|
|
ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
|
|
|
IF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION)
|
|
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)
|
|
ENDIF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION)
|
|
|
IF(NOT QT_FOUND AND 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.")
|
|
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.")
|