From 80b360502df1474a8c766d318fc1a62739279db7 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 17 Dec 2022 19:33:39 +0100
Subject: [PATCH] cmake: stop finding SDLxtest
---
cmake/FindSDL2test.cmake | 22 ----------------------
test/CMakeLists.txt | 8 ++++----
2 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 cmake/FindSDL2test.cmake
diff --git a/cmake/FindSDL2test.cmake b/cmake/FindSDL2test.cmake
deleted file mode 100644
index 56613b8..0000000
--- a/cmake/FindSDL2test.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-include(FindPackageHandleStandardArgs)
-include("${CMAKE_CURRENT_LIST_DIR}/CommonFindSDL2.cmake")
-
-find_library(SDL2_TEST_LIBRARY
- NAMES SDL2test SDL2_test
- HINTS ${SDL2_DIR} ENV SDL2_DIR
- PATH_SUFFIXES ${_lib_suffixes}
-)
-
-find_package_handle_standard_args(SDL2test
- REQUIRED_VARS SDL2_TEST_LIBRARY
-)
-
-if(SDL2test_FOUND)
- if(NOT TARGET SDL2::SDL2test)
- add_library(SDL2::SDL2test UNKNOWN IMPORTED)
- set_target_properties(SDL2::SDL2test PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${SDL2_TEST_LIBRARY}"
- )
- endif()
-endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8b5b310..086528f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake")
-find_package(SDL2 CONFIG COMPONENTS ${SDL2_COMPONENTS} SDL2main SDL2test)
+find_package(SDL2 CONFIG COMPONENTS ${SDL2_COMPONENTS} SDL2main)
if(NOT SDL2_FOUND OR NOT TARGET SDL2::SDL2)
find_package(PrivateSDL2 MODULE REQUIRED)
set(SDL2_TARGET "PrivateSDL2::PrivateSDL2")
@@ -34,7 +34,7 @@ if(NOT TARGET SDL2::SDL2test)
find_package(SDL2test MODULE REQUIRED)
endif()
-find_package(SDL3 QUIET CONFIG COMPONENTS ${SDL3_COMPONENTS} SDL3_test)
+find_package(SDL3 QUIET CONFIG COMPONENTS ${SDL3_COMPONENTS})
if(NOT SDL3_FOUND)
message(STATUS "SDL3 not found -> not testing SDL_gesture with SDL3")
endif()
@@ -44,10 +44,10 @@ if(NOT TARGET SDL_gesture::SDL_gesture)
endif()
add_executable(testgesture_sdl2 testgesture.c)
-target_link_libraries(testgesture_sdl2 PRIVATE SDL2::SDL2test SDL_gesture::SDL_gesture SDL2::SDL2main ${SDL2_TARGET})
+target_link_libraries(testgesture_sdl2 PRIVATE SDL_gesture::SDL_gesture SDL2::SDL2main ${SDL2_TARGET})
if(TARGET ${SDL3_TARGET})
add_executable(testgesture_sdl3 testgesture.c)
target_compile_definitions(testgesture_sdl3 PRIVATE TESTGESTURE_SDL3)
- target_link_libraries(testgesture_sdl3 PRIVATE SDL3::SDL3_test SDL_gesture::SDL_gesture ${SDL3_TARGET})
+ target_link_libraries(testgesture_sdl3 PRIVATE SDL_gesture::SDL_gesture ${SDL3_TARGET})
endif()