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

Merge commit 'd542f43b2aa23966913c08e4973793150e8073d0' into main

This commit is contained in:
Sam Lantinga 2022-10-23 16:34:36 -07:00
parent f20c2759f9 d542f43b2a
commit 3bc84acebc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -3346,15 +3346,16 @@ if(NOT SDL2_DISABLE_INSTALL)
##### Export files ##### ##### Export files #####
if (WINDOWS AND NOT MINGW) if (WINDOWS AND NOT MINGW)
set(PKG_PREFIX "cmake") set(SDL_INSTALL_CMAKEDIR_DEFAULT "cmake")
else () else ()
set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2") set(SDL_INSTALL_CMAKEDIR_DEFAULT "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2")
endif () endif ()
set(SDL_INSTALL_CMAKEDIR "${SDL_INSTALL_CMAKEDIR_DEFAULT}" CACHE STRING "Location where to install SDL2Config.cmake")
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
configure_package_config_file(SDL2Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2Config.cmake" configure_package_config_file(SDL2Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2Config.cmake"
PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_FULL_BINDIR CMAKE_INSTALL_FULL_INCLUDEDIR CMAKE_INSTALL_FULL_LIBDIR PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_FULL_BINDIR CMAKE_INSTALL_FULL_INCLUDEDIR CMAKE_INSTALL_FULL_LIBDIR
INSTALL_DESTINATION ${PKG_PREFIX} INSTALL_DESTINATION "${SDL_INSTALL_CMAKEDIR}"
) )
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/SDL2ConfigVersion.cmake" write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/SDL2ConfigVersion.cmake"
VERSION ${SDL_VERSION} VERSION ${SDL_VERSION}
@ -3365,7 +3366,7 @@ if(NOT SDL2_DISABLE_INSTALL)
install(EXPORT SDL2Targets install(EXPORT SDL2Targets
FILE SDL2Targets.cmake FILE SDL2Targets.cmake
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION "${SDL_INSTALL_CMAKEDIR}"
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7) if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2Targets install(EXPORT_ANDROID_MK SDL2Targets
@ -3377,7 +3378,7 @@ if(NOT SDL2_DISABLE_INSTALL)
install(EXPORT SDL2mainTargets install(EXPORT SDL2mainTargets
FILE SDL2mainTargets.cmake FILE SDL2mainTargets.cmake
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION "${SDL_INSTALL_CMAKEDIR}"
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7) if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2mainTargets install(EXPORT_ANDROID_MK SDL2mainTargets
@ -3389,7 +3390,7 @@ if(NOT SDL2_DISABLE_INSTALL)
install(EXPORT SDL2staticTargets install(EXPORT SDL2staticTargets
FILE SDL2staticTargets.cmake FILE SDL2staticTargets.cmake
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION "${SDL_INSTALL_CMAKEDIR}"
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7) if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2staticTargets install(EXPORT_ANDROID_MK SDL2staticTargets
@ -3401,7 +3402,7 @@ if(NOT SDL2_DISABLE_INSTALL)
install(EXPORT SDL2testTargets install(EXPORT SDL2testTargets
FILE SDL2testTargets.cmake FILE SDL2testTargets.cmake
NAMESPACE SDL2:: NAMESPACE SDL2::
DESTINATION ${PKG_PREFIX} DESTINATION "${SDL_INSTALL_CMAKEDIR}"
) )
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7) if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL2testTargets install(EXPORT_ANDROID_MK SDL2testTargets
@ -3413,7 +3414,7 @@ if(NOT SDL2_DISABLE_INSTALL)
FILES FILES
${CMAKE_CURRENT_BINARY_DIR}/SDL2Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/SDL2Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/SDL2ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/SDL2ConfigVersion.cmake
DESTINATION ${PKG_PREFIX} DESTINATION "${SDL_INSTALL_CMAKEDIR}"
COMPONENT Devel COMPONENT Devel
) )