From 2021a109272f6c4319ca104a9a9ff0533ccde430 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 3 May 2022 20:37:03 +0100 Subject: [PATCH] cmake: Defer test subproject until after defining install/uninstall It looks as though something in the test subproject "leaks" into the main build system, causing us to try to install ${builddir}/test/sdl2.pc instead of the correct ${builddir}/sdl2.pc. Moving the tests subproject further down avoids this. Resolves: https://github.com/libsdl-org/SDL/issues/5604 Signed-off-by: Simon McVittie --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76978aaa4..49850fc41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2965,7 +2965,6 @@ if(SDL_TEST) include_directories(AFTER "${SDL2_SOURCE_DIR}/include") file(GLOB TEST_SOURCES ${SDL2_SOURCE_DIR}/src/test/*.c) add_library(SDL2_test STATIC ${TEST_SOURCES}) - add_subdirectory(test) endif() ##### Installation targets ##### @@ -3091,3 +3090,8 @@ if(NOT SDL2_DISABLE_UNINSTALL) endif() endif() +##### Tests subproject (must appear after the install/uninstall targets) ##### + +if(SDL_TEST) + add_subdirectory(test) +endif()