encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-05-03 20:37:03 +01:00 committed by Sam Lantinga
parent db9e14e504
commit 2021a10927
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2965,7 +2965,6 @@ if(SDL_TEST)
include_directories(AFTER "${SDL2_SOURCE_DIR}/include") include_directories(AFTER "${SDL2_SOURCE_DIR}/include")
file(GLOB TEST_SOURCES ${SDL2_SOURCE_DIR}/src/test/*.c) file(GLOB TEST_SOURCES ${SDL2_SOURCE_DIR}/src/test/*.c)
add_library(SDL2_test STATIC ${TEST_SOURCES}) add_library(SDL2_test STATIC ${TEST_SOURCES})
add_subdirectory(test)
endif() endif()
##### Installation targets ##### ##### Installation targets #####
@ -3091,3 +3090,8 @@ if(NOT SDL2_DISABLE_UNINSTALL)
endif() endif()
endif() endif()
##### Tests subproject (must appear after the install/uninstall targets) #####
if(SDL_TEST)
add_subdirectory(test)
endif()