summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 716256cd5..de93ca2c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,7 +254,9 @@ if(ENABLE_QT)
254 254
255 # Check for system Qt on Linux, fallback to bundled Qt 255 # Check for system Qt on Linux, fallback to bundled Qt
256 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") 256 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
257 find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets) 257 if (NOT YUZU_USE_BUNDLED_QT)
258 find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets)
259 endif()
258 if (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT) 260 if (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT)
259 # Check for dependencies, then enable bundled Qt download 261 # Check for dependencies, then enable bundled Qt download
260 262
@@ -337,6 +339,8 @@ if(ENABLE_QT)
337 endif() 339 endif()
338 endif() 340 endif()
339 341
342 set(YUZU_QT_NO_CMAKE_SYSTEM_PATH)
343
340 # Workaround for an issue where conan tries to build Qt from scratch instead of download prebuilt binaries 344 # Workaround for an issue where conan tries to build Qt from scratch instead of download prebuilt binaries
341 set(QT_PREFIX_HINT) 345 set(QT_PREFIX_HINT)
342 346
@@ -354,8 +358,10 @@ if(ENABLE_QT)
354 endif() 358 endif()
355 359
356 set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") 360 set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
361
362 set(YUZU_QT_NO_CMAKE_SYSTEM_PATH "NO_CMAKE_SYSTEM_PATH")
357 endif() 363 endif()
358 find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets ${QT_PREFIX_HINT} NO_CMAKE_SYSTEM_PATH) 364 find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH})
359 if (YUZU_USE_QT_WEB_ENGINE) 365 if (YUZU_USE_QT_WEB_ENGINE)
360 find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) 366 find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets)
361 endif() 367 endif()