diff options
| author |  lat9nq | 2021-04-17 23:35:13 -0400 |
|---|---|---|
| committer | lat9nq | 2021-04-17 23:42:57 -0400 |
| commit | de69a5266fde93a793fc3664db205ec7bad3e9a9 (patch) | |
| tree | 6d14faea4a91e9cd8e5a516712b677354a92a41b /src | |
| parent | Merge pull request #6204 from lat9nq/sdl2-external (diff) | |
| download | yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar.gz yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar.xz yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.zip | |
cmake: Use SDL 2.0.14 and fix CMake scope issue
Forces using SDL 2.0.14. Upgrades the SDL external to that version. Adds
a message when switching to the external.
Fixes an error where input_common only links to SDL when SDL2_FOUND is
set, but externals/CMakeLists cannot set that variable to the required
scope. Switch to using ENABLE_SDL2, which we can use since we now
include the SDL source.
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index c3cfe7efc..de53e1fda 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt | |||
| @@ -62,7 +62,7 @@ else() | |||
| 62 | ) | 62 | ) |
| 63 | endif() | 63 | endif() |
| 64 | 64 | ||
| 65 | if(SDL2_FOUND) | 65 | if (ENABLE_SDL2) |
| 66 | target_sources(input_common PRIVATE | 66 | target_sources(input_common PRIVATE |
| 67 | sdl/sdl_impl.cpp | 67 | sdl/sdl_impl.cpp |
| 68 | sdl/sdl_impl.h | 68 | sdl/sdl_impl.h |