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

Merge commit '3e1021239a29b377fec7af9b45cd49b5d42531ca' into main

This commit is contained in:
Sam Lantinga 2022-06-29 17:24:36 -07:00
parent f716a9a271 3e1021239a
commit fe00c19455
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -3076,6 +3076,7 @@ if(SDL_TEST)
set_target_properties(SDL2_test PROPERTIES set_target_properties(SDL2_test PROPERTIES
EXPORT_NAME SDL2test) EXPORT_NAME SDL2test)
target_include_directories(SDL2_test PUBLIC target_include_directories(SDL2_test PUBLIC
"$<BUILD_INTERFACE:${SDL2_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>"
"$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>"
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL2>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL2>)
target_link_libraries(SDL2_test PRIVATE ${EXTRA_TEST_LIBS}) target_link_libraries(SDL2_test PRIVATE ${EXTRA_TEST_LIBS})

4
test/CMakeLists.txt
View File

@ -6,10 +6,6 @@ if(SDL_INSTALL_TESTS)
include(GNUInstallDirs) include(GNUInstallDirs)
endif() endif()
# Global settings for all of the test targets
# FIXME: is this wrong?
remove_definitions(-DUSING_GENERATED_CONFIG_H)
if(PSP) if(PSP)
link_libraries( link_libraries(
SDL2main SDL2main