qgis · Jan 8, 2015
diff --git a/‎.travis.yml
Lines changed: 2 additions & 1 deletion b/‎.travis.yml
Lines changed: 2 additions & 1 deletion
diff --git a/‎CMakeLists.txt
Lines changed: 8 additions & 23 deletions b/‎CMakeLists.txt
Lines changed: 8 additions & 23 deletions
@@ -18,7 +18,8 @@ before_install:
 install:
   - mkdir build
   - cd build
-  - cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DSUPPRESS_QT_WARNINGS=ON ..
+  - cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF \
+          -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON ..
 
 script: xvfb-run ctest -V -E 'Atlas|atlas|PyQgsPalLabelingCanvas|PyQgsPalLabelingServer|qgis_wcsprovidertest' -S ../qgis-test-travis.ctest --output-on-failure
 
@@ -70,14 +70,7 @@ SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
 
 SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
 
-SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
 SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
-IF(WITH_INTERNAL_SPATIALITE)
-  SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
-  IF(WIN32 OR APPLE OR CYGWIN)
-    FIND_PACKAGE(Iconv REQUIRED)
-  ENDIF(WIN32 OR APPLE OR CYGWIN)
-ENDIF (WITH_INTERNAL_SPATIALITE)
 
 SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
 IF(WITH_ORACLE)
@@ -200,21 +193,17 @@ ELSE (WITH_INTERNAL_QEXTSERIALPORT)
   FIND_PACKAGE(Qextserialport REQUIRED)
 ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
 
-IF (NOT WITH_INTERNAL_SPATIALITE)
-  FIND_PACKAGE(Sqlite3)
-  IF (NOT SQLITE3_FOUND)
-    MESSAGE (SEND_ERROR "sqlite3 dependency was not found (try compiling with internal spatialite)!")
-  ENDIF (NOT SQLITE3_FOUND)
-ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+FIND_PACKAGE(Sqlite3)
+IF (NOT SQLITE3_FOUND)
+  MESSAGE (SEND_ERROR "sqlite3 dependency was not found!")
+ENDIF (NOT SQLITE3_FOUND)
 
 # optional
 IF (WITH_POSTGRESQL)
   FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
 ENDIF (WITH_POSTGRESQL)
 
-IF (NOT WITH_INTERNAL_SPATIALITE)
-  FIND_PACKAGE(SPATIALITE REQUIRED)
-ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+FIND_PACKAGE(SPATIALITE REQUIRED)
 
 IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
   MESSAGE (SEND_ERROR "Some dependencies were not found!")
@@ -251,27 +240,23 @@ IF (ENABLE_QT5)
   FIND_PACKAGE(Qt5Script REQUIRED)
   FIND_PACKAGE(Qt5Sql REQUIRED)
   SET(QT5_BUILD TRUE)
-
   INCLUDE("cmake/modules/ECMQt4To5Porting.cmake")
+  MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
 ELSE()
   FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED)
   SET(QT_USE_QTXML 1)
   SET(QT_USE_QTNETWORK 1)
   SET(QT_USE_QTSVG 1)
   SET(QT_USE_QTSQL 1)
   SET(QT_USE_QTWEBKIT 1)
-  IF (WITH_CUSTOM_WIDGETS)
-    SET(QT_USE_QTDESIGNER 1)
-  ENDIF (WITH_CUSTOM_WIDGETS)
-
   IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
     MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
   ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
 
   INCLUDE( ${QT_USE_FILE} )
-ENDIF()
 
-MESSAGE(STATUS "Found Qt version: ${QTVERSION}")
+  MESSAGE(STATUS "Found Qt version: ${QTVERSION}")
+ENDIF()
 
 IF (WITH_QTMOBILITY)
     FIND_PACKAGE(QtMobility 1.1.0)