Merge commit '4ad4fe67c7f832ec6e8e8a5c04b030691753f39a' into main

main
Sam Lantinga 2022-06-29 17:24:34 -07:00
commit f716a9a271
1 changed files with 6 additions and 6 deletions

View File

@ -3169,12 +3169,12 @@ if(NOT SDL2_DISABLE_INSTALL)
) )
file(GLOB INCLUDE_FILES ${SDL2_SOURCE_DIR}/include/*.h) file(GLOB INCLUDE_FILES ${SDL2_SOURCE_DIR}/include/*.h)
file(GLOB BIN_INCLUDE_FILES ${SDL2_BINARY_DIR}/include/*.h) list(REMOVE_ITEM INCLUDE_FILES
foreach(_FNAME ${BIN_INCLUDE_FILES}) "${SDL2_SOURCE_DIR}/include/SDL_config.h"
get_filename_component(_INCNAME ${_FNAME} NAME) "${SDL2_SOURCE_DIR}/include/SDL_revision.h")
list(REMOVE_ITEM INCLUDE_FILES ${SDL2_SOURCE_DIR}/include/${_INCNAME}) list(APPEND INCLUDE_FILES
endforeach() "${SDL2_BINARY_DIR}/include/SDL_revision.h"
list(APPEND INCLUDE_FILES ${BIN_INCLUDE_FILES}) "${SDL2_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>/SDL_config.h")
install(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SDL2) install(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SDL2)
string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE) string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE)