Merge remote-tracking branch 'origin/master' into tidy/warnings

CMakeLists.txt

@@ -231,7 +231,6 @@ INCLUDE (ThirdPartyArpack)
 INCLUDE (ThirdPartyMPI)
 INCLUDE (ThirdPartyPETSc)
 INCLUDE (ThirdPartyVTK)
-INCLUDE (ThirdPartyQT4)
 INCLUDE (ThirdPartySMV)
 INCLUDE (ThirdPartyOCE)
 INCLUDE (ThirdPartyTetGen)

cmake/ThirdPartyLoki.cmake

@@ -8,7 +8,7 @@
 
 # Try to find system Loki headers. Hint /opt/local/include for MacPorts
 # (although there is no Portfile for Loki currently).
-FIND_PATH(LOKI_INCLUDE_DIR loki/Typelist.h PATHS /opt/local/include)
+FIND_PATH(LOKI_INCLUDE_DIR loki/Singleton.h PATHS /opt/local/include)
 
 IF (LOKI_INCLUDE_DIR)
     SET(BUILD_LOKI OFF)

cmake/ThirdPartyQT4.cmake

-# QT4 
-OPTION(NEKTAR_USE_QT4
-    "Use QT4 for graphical tools and utilities." OFF)
-
-IF( NEKTAR_USE_QT4 )
-    FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-    INCLUDE(${QT_USE_FILE})
-    ADD_DEFINITIONS(${QT_DEFINITIONS})
-    IF (QT4_FOUND)
-        MESSAGE(STATUS "Found QT4: ${QT_INCLUDE_DIR}")
-    ENDIF(QT4_FOUND)
-ENDIF( NEKTAR_USE_QT4 )