From d7d7ae8219781cefd67e6c08a4c2e7d3ffe37e60 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 4 Nov 2022 12:12:46 +0000 Subject: Qt: enable recent Linux features on more Unices - Prevent sleep via xdg-desktop-portal after fa7abafa5f2a - Pause on suspend after b7642cff3611 - Exit on SIGINT/SIGTERM after 9479940a1fc7 - Improve dark themes after b51db125676f --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b625743ea..c6fc5dd9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,11 +218,11 @@ if(ENABLE_QT) set(QT_VERSION 5.15) # Check for system Qt on Linux, fallback to bundled Qt - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if (UNIX AND NOT APPLE) if (NOT YUZU_USE_BUNDLED_QT) find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets DBus Multimedia) endif() - if (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT) + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT)) # Check for dependencies, then enable bundled Qt download # Check that the system GLIBCXX version is compatible @@ -323,7 +323,7 @@ if(ENABLE_QT) set(YUZU_QT_NO_CMAKE_SYSTEM_PATH "NO_CMAKE_SYSTEM_PATH") endif() - if ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND YUZU_USE_BUNDLED_QT) + if (UNIX AND NOT APPLE AND YUZU_USE_BUNDLED_QT) find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets Concurrent Multimedia DBus ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) else() find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets Concurrent Multimedia ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) -- cgit v1.2.3