Merge commit '3617691fe0cb3b29ffcdeb5567d85126de91ba15' into main

main
Sam Lantinga 2022-06-29 17:24:49 -07:00
commit 4ff3d844ad
1 changed files with 16 additions and 0 deletions

View File

@ -3160,6 +3160,10 @@ if(NOT SDL2_DISABLE_INSTALL)
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION ${PKG_PREFIX}
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2Targets
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL2")
endif()
endif() endif()
if(NOT WINDOWS_STORE AND NOT SDL2_DISABLE_SDL2MAIN) if(NOT WINDOWS_STORE AND NOT SDL2_DISABLE_SDL2MAIN)
@ -3168,6 +3172,10 @@ if(NOT SDL2_DISABLE_INSTALL)
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION ${PKG_PREFIX}
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2mainTargets
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL2main")
endif()
endif() endif()
if(SDL_STATIC) if(SDL_STATIC)
@ -3176,6 +3184,10 @@ if(NOT SDL2_DISABLE_INSTALL)
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION ${PKG_PREFIX}
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2staticTargets
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL2-static")
endif()
endif() endif()
if(SDL_TEST) if(SDL_TEST)
@ -3184,6 +3196,10 @@ if(NOT SDL2_DISABLE_INSTALL)
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION ${PKG_PREFIX}
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2testTargets
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL2test")
endif()
endif() endif()
install( install(