diff options
| author | 2020-02-17 18:33:20 -0500 | |
|---|---|---|
| committer | 2020-02-17 18:33:20 -0500 | |
| commit | 7f380f4ffaa90c968b9bd1d362bbef5677de0497 (patch) | |
| tree | 22417635c1bbb2bc9a57743ae21856ab1c5277ad | |
| parent | Merge pull request #3420 from namkazt/master2 (diff) | |
| parent | fix CMake build errors for certain SDL2 installations (diff) | |
| download | yuzu-7f380f4ffaa90c968b9bd1d362bbef5677de0497.tar.gz yuzu-7f380f4ffaa90c968b9bd1d362bbef5677de0497.tar.xz yuzu-7f380f4ffaa90c968b9bd1d362bbef5677de0497.zip | |
Merge pull request #3429 from brianclinkenbeard/fix-cmake-sdl2-arch
Fix CMake build errors for certain SDL2 installations
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 44ed4196d..467d769a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -157,8 +157,14 @@ if (ENABLE_SDL2) | |||
| 157 | target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") | 157 | target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") |
| 158 | else() | 158 | else() |
| 159 | find_package(SDL2 REQUIRED) | 159 | find_package(SDL2 REQUIRED) |
| 160 | include_directories(${SDL2_INCLUDE_DIRS}) | ||
| 161 | 160 | ||
| 161 | # Some installations don't set SDL2_LIBRARIES | ||
| 162 | if("${SDL2_LIBRARIES}" STREQUAL "") | ||
| 163 | message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") | ||
| 164 | set(SDL2_LIBRARIES "SDL2::SDL2") | ||
| 165 | endif() | ||
| 166 | |||
| 167 | include_directories(${SDL2_INCLUDE_DIRS}) | ||
| 162 | add_library(SDL2 INTERFACE) | 168 | add_library(SDL2 INTERFACE) |
| 163 | target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") | 169 | target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") |
| 164 | endif() | 170 | endif() |