diff options
| author |  lat9nq | 2021-07-15 05:25:00 -0400 |
|---|---|---|
| committer | lat9nq | 2021-07-16 02:26:34 -0400 |
| commit | 4c6cc675201c1a17d674b7910233a1d8eb474077 (patch) | |
| tree | 62f7d98734ffdb921cbc4dbf7c18f350725ecdf1 | |
| parent | cmake: Only use NO_CMAKE_SYSTEM_PATH when needed for Qt (diff) | |
| download | yuzu-4c6cc675201c1a17d674b7910233a1d8eb474077.tar.gz yuzu-4c6cc675201c1a17d674b7910233a1d8eb474077.tar.xz yuzu-4c6cc675201c1a17d674b7910233a1d8eb474077.zip | |
cmake: Only search for Qt when we need to
When YUZU_USE_BUNDLED_QT was specified on a system with a compliant Qt
version installed, CMake configuration would cause an error due to
mixing YUZU_USE_BUNDLED_QT with the system Qt.
Solution is to only search for Qt when YUZU_USE_BUNDLED_QT is disabled.
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bf6ba58ba..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 | ||