diff options
author | Zephyron <zephyron@citron-emu.org> | 2025-02-02 09:20:11 +1000 |
---|---|---|
committer | Zephyron <zephyron@citron-emu.org> | 2025-02-02 09:20:11 +1000 |
commit | 19ce9d695ef0fbc7fca77f3f738aae0c2b5b70c6 (patch) | |
tree | f0b0ab02e9e58d988691f503dc72abb7c4fa17b0 | |
parent | 44944c4d80753b0ef13bf7695829ff54970d8da6 (diff) |
fix: compilation errors with Qt and Discord RPC
- Downgrade Qt version from 6.8.1 to 6.7.3 as 6.8.1 is not yet widely available
- Add USE_DISCORD_PRESENCE check around discord-rpc compile options to prevent
build errors when Discord integration is disabled
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3465b7f73..1fd703408 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -419,7 +419,7 @@ add_subdirectory(externals) if (ENABLE_QT) if (NOT USE_SYSTEM_QT) - download_qt(6.8.1) + download_qt(6.7.3) endif() find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent Network) @@ -674,4 +674,6 @@ if(ENABLE_QT AND UNIX AND NOT APPLE) DESTINATION "share/metainfo") endif() -target_compile_options(discord-rpc PRIVATE -fpermissive) +if (USE_DISCORD_PRESENCE) + target_compile_options(discord-rpc PRIVATE -fpermissive) +endif() |