diff options
| author | bunnei <bunneidev@gmail.com> | 2021-07-20 02:54:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 02:54:03 +0200 |
| commit | ffc78ce9c17554bc72f205d6ea55ef7bc3363b47 (patch) | |
| tree | d117cb643addb8d3ffb363951d892fd07278e1c7 /CMakeLists.txt | |
| parent | Merge pull request #6651 from lat9nq/update-settings (diff) | |
| parent | sdl_impl, emu_window: Remove clang ignore (diff) | |
| download | yuzu-ffc78ce9c17554bc72f205d6ea55ef7bc3363b47.tar yuzu-ffc78ce9c17554bc72f205d6ea55ef7bc3363b47.tar.gz yuzu-ffc78ce9c17554bc72f205d6ea55ef7bc3363b47.tar.bz2 yuzu-ffc78ce9c17554bc72f205d6ea55ef7bc3363b47.tar.lz yuzu-ffc78ce9c17554bc72f205d6ea55ef7bc3363b47.tar.xz yuzu-ffc78ce9c17554bc72f205d6ea55ef7bc3363b47.tar.zst yuzu-ffc78ce9c17554bc72f205d6ea55ef7bc3363b47.zip | |
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de93ca2c2..857550e71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ project(yuzu) option(ENABLE_SDL2 "Enable the SDL2 frontend" ON) CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON "ENABLE_SDL2;MSVC" OFF) # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion -option(YUZU_ALLOW_SYSTEM_SDL2 "Try using system SDL2 before fallling back to one from externals" OFF) +CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ON "ENABLE_SDL2;NOT MSVC" OFF) option(ENABLE_QT "Enable the Qt frontend" ON) option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF) @@ -393,26 +393,20 @@ if (ENABLE_SDL2) add_library(SDL2 INTERFACE) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") + elseif (YUZU_USE_EXTERNAL_SDL2) + message(STATUS "Using SDL2 from externals.") else() - if (YUZU_ALLOW_SYSTEM_SDL2) - find_package(SDL2 2.0.15 QUIET) - - if (SDL2_FOUND) - # Some installations don't set SDL2_LIBRARIES - if("${SDL2_LIBRARIES}" STREQUAL "") - message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") - set(SDL2_LIBRARIES "SDL2::SDL2") - endif() + find_package(SDL2 2.0.15 REQUIRED) - include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) - add_library(SDL2 INTERFACE) - target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") - else() - message(STATUS "SDL2 2.0.15 or newer not found, falling back to externals.") - endif() - else() - message(STATUS "Using SDL2 from externals.") + # Some installations don't set SDL2_LIBRARIES + if("${SDL2_LIBRARIES}" STREQUAL "") + message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") + set(SDL2_LIBRARIES "SDL2::SDL2") endif() + + include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) + add_library(SDL2 INTERFACE) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") endif() endif() |