diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d77ee6..0033946 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,8 @@ if(APPLE) set(CMAKE_BUILD_WITH_INSTALL_RPATH true) set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") + list(APPEND SDL2_PATH "${CMAKE_CURRENT_LIST_DIR}/extern") + list(APPEND SDL2_MIXER_PATH "${CMAKE_CURRENT_LIST_DIR}/extern") endif() # SDL2main is not needed diff --git a/CMakeModules/FindSDL2.cmake b/CMakeModules/FindSDL2.cmake index 91181c4..dfaaa17 100644 --- a/CMakeModules/FindSDL2.cmake +++ b/CMakeModules/FindSDL2.cmake @@ -77,7 +77,6 @@ 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 dc052a8..9bf2719 100644 --- a/CMakeModules/FindSDL2_mixer.cmake +++ b/CMakeModules/FindSDL2_mixer.cmake @@ -42,11 +42,6 @@ # (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 @@ -54,7 +49,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_SEARCH_PATHS} + PATHS ${SDL2_MIXER_PATH} ) if(CMAKE_SIZEOF_VOID_P EQUAL 8) @@ -69,7 +64,7 @@ find_library(SDL2_MIXER_LIBRARY ENV SDL2MIXERDIR ENV SDL2DIR PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX} - PATHS ${SDL2_MIXER_SEARCH_PATHS} + PATHS ${SDL2_MIXER_PATH} ) if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")