Browse Source

Abort FindQt4.cmake if Qt 5 is found.

David Faure 13 years ago
parent
commit
1dfe15c431
1 changed files with 16 additions and 4 deletions
  1. 16 4
      Modules/FindQt4.cmake

+ 16 - 4
Modules/FindQt4.cmake

@@ -1169,10 +1169,22 @@ ELSE( Qt4_FIND_COMPONENTS )
 
 ENDIF( Qt4_FIND_COMPONENTS )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
-  REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
-  VERSION_VAR QTVERSION
-  )
+if (${QT_VERSION_MAJOR} GREATER 4)
+    SET(VERSION_MSG "Found unsuitable Qt version \"${QTVERSION}\" from ${QT_QMAKE_EXECUTABLE}")
+    SET(QT4_FOUND FALSE)
+    IF(Qt4_FIND_REQUIRED)
+       MESSAGE( FATAL_ERROR "${VERSION_MSG}, this code requires Qt 4.x")
+    ELSE(Qt4_FIND_REQUIRED)
+      IF(NOT Qt4_FIND_QUIETLY)
+         MESSAGE( STATUS    "${VERSION_MSG}")
+      ENDIF(NOT Qt4_FIND_QUIETLY)
+    ENDIF(Qt4_FIND_REQUIRED)
+else()
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
+    REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
+    VERSION_VAR QTVERSION
+    )
+endif()
 
 #######################################
 #