From d71942f7a4b486499d24e084a413897be8651a52 Mon Sep 17 00:00:00 2001 From: Squall-Leonhart Date: Wed, 24 Jan 2024 11:56:45 +1100 Subject: [PATCH] revert findsdl2.cmake --- cmake/FindSDL2.cmake | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake index fe7cf3c2..f174ed63 100644 --- a/cmake/FindSDL2.cmake +++ b/cmake/FindSDL2.cmake @@ -204,22 +204,21 @@ IF(SDL2_LIBRARY_TEMP) # Add libsamplerate with vcpkg if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg") - find_package(SampleRate CONFIG REQUIRED) - if(WIN32) - unset(arch_suffix) - unset(path_prefix) - if(VCPKG_TARGET_TRIPLET MATCHES -static) - set(arch_suffix -static) - endif() - if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$") - set(path_prefix debug) - endif() - set(installed_prefix ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix}) - - SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} SampleRate::samplerate) - else() - SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} SampleRate::samplerate) + if(WIN32) + unset(arch_suffix) + unset(path_prefix) + if(VCPKG_TARGET_TRIPLET MATCHES -static) + set(arch_suffix -static) endif() + if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$") + set(path_prefix debug) + endif() + set(installed_prefix ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix}) + + SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${installed_prefix}/lib/samplerate.lib) + else() + SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} -lsamplerate) + endif() endif() # Add some stuff from pkg-config, if available @@ -261,4 +260,4 @@ ENDIF(SDL2_LIBRARY_TEMP) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) \ No newline at end of file