summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2017-09-04 19:35:38 +0200
committerspycrab <spycrab@users.noreply.github.com>2017-09-04 22:28:48 +0200
commit28799bbe7984cc3c26aef9df0be2bf9833dd6ea2 (patch)
tree2af1fec09ed674bdc02d4f33526c26de0ea1274c
parent018ad987149196cb016d11e2ea651e36679bd994 (diff)
CMake: Build DolphinQt2 by default
-rw-r--r--CMakeLists.txt2
-rw-r--r--Source/Core/DolphinQt2/CMakeLists.txt10
2 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 398793cd7c..98d2b6a865 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ option(TRY_X11 "Enables X11 Support" ON)
option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
option(USE_UPNP "Enables UPnP port mapping support" ON)
option(ENABLE_WX "Enable wxWidgets (Default)" ON)
-option(ENABLE_QT2 "Enable Qt2 (use the other experimental Qt interface)" OFF)
+option(ENABLE_QT2 "Enable Qt2 (use the other experimental Qt interface)" ON)
option(ENABLE_LTO "Enables Link Time Optimization" OFF)
option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt
index 04726b8434..7aa619b63f 100644
--- a/Source/Core/DolphinQt2/CMakeLists.txt
+++ b/Source/Core/DolphinQt2/CMakeLists.txt
@@ -1,5 +1,11 @@
-find_package(Qt5Widgets REQUIRED)
-find_Package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets)
+find_package(Qt5Gui)
+
+if(NOT Qt5Widgets_FOUND OR NOT Qt5Gui_FOUND)
+ message(FATAL_ERROR "Could not find Qt5, which is required to build the DolphinQt2 frontend. If you don't want to build the Qt frontend, pass -DENABLE_QT2=False to
+CMake.")
+endif()
+
set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES "")
message(STATUS "Found Qt version ${Qt5Core_VERSION}")