From 62c439814f80f77172e4f1dd0db3a5b09925cc06 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Thu, 26 Jan 2017 14:00:28 +0100 Subject: [PATCH] cmake: Move Qt5 search to DolphinQt build script --- CMakeLists.txt | 5 ----- Source/Core/DolphinQt2/CMakeLists.txt | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 628f877e98..4e34b34398 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -876,11 +876,6 @@ if (OPENSLES_LIBRARIES AND OPENSLES_INCLUDE_DIR) message(STATUS "OpenSLES found, enabling OpenSLES sound backend") endif() -if(ENABLE_QT2) - find_package(Qt5Widgets REQUIRED) - message(STATUS "Found Qt version ${Qt5Core_VERSION}, enabling the Qt backend") -endif() - if(NOT DISABLE_WX) find_package(wxWidgets COMPONENTS core aui adv) diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt index 1030388ef8..5505cd90c3 100644 --- a/Source/Core/DolphinQt2/CMakeLists.txt +++ b/Source/Core/DolphinQt2/CMakeLists.txt @@ -1,3 +1,6 @@ +find_package(Qt5Widgets REQUIRED) +message(STATUS "Found Qt version ${Qt5Core_VERSION}") + include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)