piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4803 from Orphis/cmake_qt

Browse Source 
cmake: Move Qt5 search to DolphinQt build script
This commit is contained in:
Mat M 2017-02-01 18:06:00 -05:00 committed by GitHub
commit f20113fce2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -876,11 +876,6 @@ if (OPENSLES_LIBRARIES AND OPENSLES_INCLUDE_DIR)
message(STATUS "OpenSLES found, enabling OpenSLES sound backend") message(STATUS "OpenSLES found, enabling OpenSLES sound backend")
endif() endif()
if(ENABLE_QT2)
find_package(Qt5Widgets REQUIRED)
message(STATUS "Found Qt version ${Qt5Core_VERSION}, enabling the Qt backend")
endif()
if(NOT DISABLE_WX) if(NOT DISABLE_WX)
find_package(wxWidgets COMPONENTS core aui adv) find_package(wxWidgets COMPONENTS core aui adv)

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

@ -1,3 +1,6 @@
find_package(Qt5Widgets REQUIRED)
message(STATUS "Found Qt version ${Qt5Core_VERSION}")
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)