[QGIS Commit] r12319 - trunk/qgis

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-03 06:35:31 -0500 (Thu, 03 Dec 2009)
New Revision: 12319

Modified:
   trunk/qgis/CMakeLists.txt
Log:
cmake 2.6 required for QtWebkit

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2009-12-03 09:52:29 UTC (rev 12318)
+++ trunk/qgis/CMakeLists.txt	2009-12-03 11:35:31 UTC (rev 12319)
@@ -20,7 +20,8 @@
 #############################################################
 # CMake settings
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3)
+# 2.6 required for QtWebkit
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 SET(CMAKE_COLOR_MAKEFILE ON)
 
@@ -180,6 +181,7 @@
 SET( QT_USE_QTNETWORK  TRUE )
 SET( QT_USE_QTSVG      TRUE )
 SET( QT_USE_QTSQL      TRUE )
+SET( QT_USE_QTWEBKIT   TRUE )
 IF (ENABLE_TESTS)
   SET( QT_USE_QTTEST  TRUE )
   ENABLE_TESTING()