From 366fc5ccae7b0cd11a11f182aa39e630088d6191 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Thu, 24 Sep 2020 18:14:03 +0200 Subject: [PATCH 1/2] fix build with system installed SDL(2) --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31d4800..c0a886b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,8 +127,10 @@ ELSE() FIND_PACKAGE(OpenAL) IF(USE_SDL2) FIND_PACKAGE(SDL2) + set(SDL_LIBRARY SDL2::SDL2) ELSE() FIND_PACKAGE(SDL) + set(SDL_LIBRARY SDL::SDL) ENDIF() LIST(APPEND OALWRAPPER_INCLUDE_PATHS From db2f6f3e85e6945e033cde3774d775021c3b039e Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Thu, 24 Sep 2020 18:14:07 +0200 Subject: [PATCH 2/2] fix cmake warnings --- CMakeScripts/FindVorbis.cmake | 2 +- CMakeScripts/FindVorbisFile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeScripts/FindVorbis.cmake b/CMakeScripts/FindVorbis.cmake index 36aa2c1..e8429ec 100644 --- a/CMakeScripts/FindVorbis.cmake +++ b/CMakeScripts/FindVorbis.cmake @@ -80,4 +80,4 @@ ENDIF() # handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG VORBIS_LIBRARIES VORBIS_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Vorbis DEFAULT_MSG VORBIS_LIBRARIES VORBIS_INCLUDE_DIR) diff --git a/CMakeScripts/FindVorbisFile.cmake b/CMakeScripts/FindVorbisFile.cmake index b16c69b..32aabd2 100644 --- a/CMakeScripts/FindVorbisFile.cmake +++ b/CMakeScripts/FindVorbisFile.cmake @@ -88,4 +88,4 @@ ENDIF() # handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBISFILE DEFAULT_MSG VORBISFILE_LIBRARIES VORBISFILE_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(VorbisFile DEFAULT_MSG VORBISFILE_LIBRARIES VORBISFILE_INCLUDE_DIR)