diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-04-17 23:35:13 -0400 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-04-17 23:42:57 -0400 |
| commit | de69a5266fde93a793fc3664db205ec7bad3e9a9 (patch) | |
| tree | 6d14faea4a91e9cd8e5a516712b677354a92a41b /externals | |
| parent | 2a2a578932cb8e08d804f9c39c2025317860e58e (diff) | |
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 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 3 | ||||
| m--------- | externals/SDL | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 6e4591b4e..e044d9730 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -46,8 +46,7 @@ add_library(unicorn-headers INTERFACE) target_include_directories(unicorn-headers INTERFACE ./unicorn/include) # SDL2 -if (NOT SDL2_FOUND) - set(SDL2_FOUND YES) +if (NOT SDL2_FOUND AND ENABLE_SDL2) add_subdirectory(SDL EXCLUDE_FROM_ALL) endif() diff --git a/externals/SDL b/externals/SDL -Subproject 983bbf9ef3e572a073a6f5877faf1c0b4803527 +Subproject 4cd981609b50ed273d80c635c1ca4c1e5518fb2 |