From 851593d5dfe870a8b1705b855148089ca1e0fde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Sun, 18 Aug 2019 17:35:10 +0200 Subject: [PATCH] Fix SDL2 if Target unavailable --- cmake/FindSDL2.cmake | 19 +++++++++++++++++++ gui/CMakeLists.txt | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 cmake/FindSDL2.cmake diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake new file mode 100644 index 0000000..d5cfcc9 --- /dev/null +++ b/cmake/FindSDL2.cmake @@ -0,0 +1,19 @@ + +find_package(SDL2 NO_MODULE QUIET) + +if(SDL2_FOUND AND NOT TARGET SDL2::SDL2) + add_library(SDL2::SDL2 UNKNOWN IMPORTED) + find_library(SDL2_LIBRARY SDL2 PATHS "${SDL2_LIBDIR}" NO_DEFAULT_PATH) + if(SDL2_LIBRARY) + set_target_properties(SDL2::SDL2 PROPERTIES + IMPORTED_LOCATION "${SDL2_LIBRARY}" + IMPORTED_LINK_INTERFACE_LIBRARIES "${SDL2_LIBRARIES}" + INTERFACE_LINK_DIRECTORIES "${SDL2_LIBDIR}" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}") + else() + set(SDL2_FOUND FALSE) + endif() +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SDL2 DEFAULT_MSG) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 3ee763f..892bdf1 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -10,7 +10,7 @@ if(CHIAKI_GUI_ENABLE_QT_GAMEPAD) find_package(Qt5 REQUIRED COMPONENTS Gamepad) endif() if(CHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER) - find_package(SDL2 REQUIRED) + find_package(SDL2 MODULE REQUIRED) endif() find_package(FFMPEG REQUIRED COMPONENTS avcodec avutil)