1 files changed, 26 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed790adf7..56f5d02b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.8.7)
 
 project(citra)
 
@@ -33,17 +33,29 @@ include_directories(${GLEW_INCLUDE_PATH})
 # workaround for GLFW linking on OSX
 link_directories(${GLFW_LIBRARY_DIRS})
 
-option(DISABLE_QT4 "Disable Qt4 GUI" OFF)
-if(NOT DISABLE_QT4)
-    include(FindQt4)
-    find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL)
-
-    if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND)
-        include(${QT_USE_FILE})
-        include_directories(${QT_INCLUDES})
-        include_directories(externals/qhexedit)
-    else()
-        message("Qt4 libraries not found! Disabling Qt4 GUI")
+option(DISABLE_QT "Disable Qt GUI" OFF)
+option(USE_QT5 "Use Qt5 when available" ON)
+if (NOT DISABLE_QT)
+    if(USE_QT5)
+        find_package(Qt5Gui)
+        find_package(Qt5Widgets)
+        find_package(Qt5OpenGL)
+        if(NOT Qt5Gui_FOUND OR NOT Qt5Widgets_FOUND OR NOT Qt5OpenGL_FOUND)
+            message("Qt5 libraries not found! Using Qt4 instead.")
+            set(USE_QT5 OFF)
+        endif()
+    endif()
+    if(NOT USE_QT5)
+        include(FindQt4)
+        find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL)
+
+        if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND)
+            include(${QT_USE_FILE})
+            include_directories(${QT_INCLUDES})
+        else()
+            message("Qt4 libraries not found! Disabling Qt GUI")
+            set(DISABLE_QT ON)
+        endif()
     endif()
 endif()
 
@@ -57,7 +69,8 @@ git_branch_name(GIT_BRANCH)
 include_directories(src)
 
 # process subdirectories
-if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
+if(NOT DISABLE_QT)
+    include_directories(externals/qhexedit)
     add_subdirectory(externals/qhexedit)
 endif()
 add_subdirectory(src)