ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6021 from spycrab/qt_build_by_default 

CMake: Build DolphinQt2 by default
This commit is contained in:
Leo Lam 2017-09-07 19:23:07 +02:00 committed by GitHub
parent 0de3593b45 28799bbe79
commit c472462498
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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_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(USE_UPNP "Enables UPnP port mapping support" ON)
option(ENABLE_WX "Enable wxWidgets (Default)" 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_LTO "Enables Link Time Optimization" OFF)
option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" 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) option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)

10
Source/Core/DolphinQt2/CMakeLists.txt
View File

@ -1,5 +1,11 @@
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets)
find_Package(Qt5Gui REQUIRED) 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 "") set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES "")
message(STATUS "Found Qt version ${Qt5Core_VERSION}") message(STATUS "Found Qt version ${Qt5Core_VERSION}")