From 78704ffa53a40d341e6e99739fa46d68ed7b7ab5 Mon Sep 17 00:00:00 2001 From: Orazio <22700499+orazioedoardo@users.noreply.github.com> Date: Wed, 26 Jul 2023 12:09:28 +0200 Subject: [PATCH] Source frameworks from extern folder --- CMakeModules/FindSDL2.cmake | 1 + CMakeModules/FindSDL2_mixer.cmake | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeModules/FindSDL2.cmake b/CMakeModules/FindSDL2.cmake index dfaaa17..91181c4 100644 --- a/CMakeModules/FindSDL2.cmake +++ b/CMakeModules/FindSDL2.cmake @@ -77,6 +77,7 @@ SET(SDL2_SEARCH_PATHS /opt/csw # Blastwave /opt ${SDL2_PATH} + ${CMAKE_SOURCE_DIR}/extern ) FIND_PATH(SDL2_INCLUDE_DIR SDL.h diff --git a/CMakeModules/FindSDL2_mixer.cmake b/CMakeModules/FindSDL2_mixer.cmake index 9bf2719..dc052a8 100644 --- a/CMakeModules/FindSDL2_mixer.cmake +++ b/CMakeModules/FindSDL2_mixer.cmake @@ -42,6 +42,11 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) +SET(SDL2_MIXER_SEARCH_PATHS + ${SDL2_MIXER_PATH} + ${CMAKE_SOURCE_DIR}/extern +) + find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h HINTS ENV SDL2MIXERDIR @@ -49,7 +54,7 @@ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h PATH_SUFFIXES SDL2 # path suffixes to search inside ENV{SDLDIR} include/SDL2 include - PATHS ${SDL2_MIXER_PATH} + PATHS ${SDL2_MIXER_SEARCH_PATHS} ) if(CMAKE_SIZEOF_VOID_P EQUAL 8) @@ -64,7 +69,7 @@ find_library(SDL2_MIXER_LIBRARY ENV SDL2MIXERDIR ENV SDL2DIR PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX} - PATHS ${SDL2_MIXER_PATH} + PATHS ${SDL2_MIXER_SEARCH_PATHS} ) if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")