kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: change to fatal error

This commit is contained in:
Bill Hoffman 2006-01-25 12:16:49 -05:00
parent aa98e3647d
commit b442e86492
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindQt.cmake
View File

@ -139,7 +139,7 @@ ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
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)
IF(QT_REQUIRED) IF(QT_REQUIRED)
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, if those are set then QT_QT_LIBRARY or QT_LIBRARY_DIR.") MESSAGE(FATAL_ERROR "CMake was unable to find QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE, if those are set then QT_QT_LIBRARY or QT_LIBRARY_DIR.")
ELSE(QT_REQUIRED) ELSE(QT_REQUIRED)
MESSAGE( "CMake was unable to find desired QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.") MESSAGE( "CMake was unable to find desired QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.")
ENDIF(QT_REQUIRED) ENDIF(QT_REQUIRED)

6
Modules/FindQt4.cmake
View File

@ -210,7 +210,7 @@ IF(QT4_QMAKE_FOUND)
ENDIF( QT_QT_INCLUDE_DIR AND NOT QT_INCLUDE_DIR) ENDIF( QT_QT_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
IF( NOT QT_INCLUDE_DIR) IF( NOT QT_INCLUDE_DIR)
IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED) IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
MESSAGE( SEND_ERROR "Could not find qglobal.h") MESSAGE( FATAL_ERROR "Could not find qglobal.h")
ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED) ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
ENDIF( NOT QT_INCLUDE_DIR) ENDIF( NOT QT_INCLUDE_DIR)
@ -700,7 +700,7 @@ IF(QT4_QMAKE_FOUND)
ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "NO") SET( QT4_FOUND "NO")
IF( Qt4_FIND_REQUIRED) IF( Qt4_FIND_REQUIRED)
MESSAGE( SEND_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!") MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
ENDIF( Qt4_FIND_REQUIRED) ENDIF( Qt4_FIND_REQUIRED)
ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET(QT_FOUND ${QT4_FOUND}) SET(QT_FOUND ${QT4_FOUND})
@ -733,7 +733,7 @@ ELSE(QT4_QMAKE_FOUND)
MESSAGE("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.") MESSAGE("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.")
ENDIF(QT_QMAKE_EXECUTABLE) ENDIF(QT_QMAKE_EXECUTABLE)
IF( Qt4_FIND_REQUIRED) IF( Qt4_FIND_REQUIRED)
MESSAGE( SEND_ERROR "Qt qmake not found!") MESSAGE( FATAL_ERROR "Qt qmake not found!")
ENDIF( Qt4_FIND_REQUIRED) ENDIF( Qt4_FIND_REQUIRED)
ENDIF(QT4_QMAKE_FOUND) ENDIF(QT4_QMAKE_FOUND)