From 0a3d038ff7cb54f3f9959074bf1ed2cfd912bc0c Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 31 Jan 2023 05:26:02 +0100 Subject: [PATCH] cmake: fix installed SDL3::SDL3_test + test on ci --- CMakeLists.txt | 2 +- cmake/test/CMakeLists.txt | 12 ++++++++++++ cmake/test/sdltest.c | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 cmake/test/sdltest.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 54cef156d..a0efb6b1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3339,7 +3339,7 @@ if(NOT SDL_DISABLE_INSTALL) set(SDL_SDLtest_INSTALL_RESOURCEDIR ".") set(SDL_SDLtest_INSTALL_CMAKEDIR "${SDL_SDL_INSTALL_CMAKEDIR}") - set(SDL_SDLtest_INSTALL_CMAKEFILENAME "SDL3_testTargets.cmake") + set(SDL_SDLtest_INSTALL_CMAKEFILENAME "SDL3testTargets.cmake") endif() ##### sdl3.pc ##### diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 48ffb65f7..ce58467ec 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -27,6 +27,9 @@ add_feature_info("TEST_SHARED" TEST_SHARED "Test linking with shared library") option(TEST_STATIC "Test linking to static SDL3 library" ON) add_feature_info("TEST_STATIC" TEST_STATIC "Test linking with static library") +option(TEST_TEST "Test linking to SDL3_test library" ON) +add_feature_info("TEST_TEST" TEST_STATIC "Test linking to SDL test library") + find_package(SDL3 REQUIRED CONFIG COMPONENTS Headers) add_library(headers_test OBJECT inc_sdl_slash.c inc_sdl_noslash.c) target_link_libraries(headers_test PRIVATE SDL3::Headers) @@ -54,6 +57,11 @@ if(TEST_SHARED) COMMAND ${CMAKE_COMMAND} -E copy_if_different "$" "$" ) endif() + + if(TEST_TEST) + add_executable(sdltest-shared sdltest.c) + target_link_libraries(sdltest-shared PRIVATE SDL3::SDL3_test SDL3::SDL3) + endif() endif() if(TEST_STATIC) @@ -70,6 +78,10 @@ if(TEST_STATIC) set_target_properties(sharedlib-static PROPERTIES C_VISIBILITY_PRESET "hidden") endif() + if(TEST_TEST) + add_executable(sdltest-static sdltest.c) + target_link_libraries(sdltest-static PRIVATE SDL3::SDL3_test SDL3::SDL3-static) + endif() endif() feature_summary(WHAT ALL) diff --git a/cmake/test/sdltest.c b/cmake/test/sdltest.c new file mode 100644 index 000000000..f598a98c5 --- /dev/null +++ b/cmake/test/sdltest.c @@ -0,0 +1,9 @@ +#include +#include + + +int main(int argc, char *argv[]) { + SDLTest_CommonState state; + SDLTest_CommonDefaultArgs(&state, argc, argv); + return 0; +}