diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-14 21:15:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-14 21:15:50 (GMT) |
| commit | 073b39f4453bf50c063f28c6ca98ec242e56c4da (patch) | |
| tree | 18f98c6bc68e3cc2d1a5610e1f2839e1dfb65f12 /Modules | |
| parent | 322de4279de4e717068857d455f8294e5093234d (diff) | |
| parent | cbdfcc6515a58731308d21bb3c5cbaa513503c01 (diff) | |
| download | CMake-073b39f4453bf50c063f28c6ca98ec242e56c4da.zip CMake-073b39f4453bf50c063f28c6ca98ec242e56c4da.tar.gz CMake-073b39f4453bf50c063f28c6ca98ec242e56c4da.tar.bz2 | |
Merge topic 'qt4-warning-clarification'
cbdfcc6 FindQt4: clarify warning message about incorrect Qt installation.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index c56827e..9b646b4 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -588,8 +588,9 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE INTERNAL "Qt library dir" FORCE) SET(QT_QTCORE_FOUND 1) ELSE() - MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}") - MESSAGE("Warning: But QtCore couldn't be found. Qt must NOT be installed correctly, or it wasn't found for cross compiling.") + MESSAGE(WARNING "${QT_QMAKE_EXECUTABLE} reported QT_INSTALL_LIBS as \"${QT_LIBRARY_DIR_TMP}\" " + "but QtCore could not be found there. " + "Qt is NOT installed correctly for the target build environment.") IF(Qt4_FIND_REQUIRED) MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.") ENDIF(Qt4_FIND_REQUIRED) |