diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e8ca02..b67b053 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ endif() if(SDL2PP_WITH_IMAGE) find_package(SDL2_image REQUIRED) - set(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_image) + set(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2_image::SDL2_image) set(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image") else() message(STATUS "SDL2_image support disabled") @@ -47,7 +47,7 @@ endif() if(SDL2PP_WITH_TTF) find_package(SDL2_ttf REQUIRED) - set(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_ttf) + set(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2_ttf::SDL2_ttf) set(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf") else() message(STATUS "SDL2_ttf support disabled") @@ -55,7 +55,7 @@ endif() if(SDL2PP_WITH_MIXER) find_package(SDL2_mixer REQUIRED) - set(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_mixer) + set(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2_mixer::SDL2_mixer) set(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer") else() message(STATUS "SDL2_mixer support disabled") @@ -243,12 +243,5 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) NAMESPACE SDL2pp:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SDL2pp ) - install( - FILES - ${PROJECT_BINARY_DIR}/cmake/SDL2ppConfig.cmake - cmake/FindSDL2_image.cmake - cmake/FindSDL2_ttf.cmake - cmake/FindSDL2_mixer.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SDL2pp - ) + install(FILES ${PROJECT_BINARY_DIR}/cmake/SDL2ppConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SDL2pp) endif() diff --git a/cmake/FindSDL2_image.cmake b/cmake/FindSDL2_image.cmake deleted file mode 100644 index f34a54e..0000000 --- a/cmake/FindSDL2_image.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# SDL2::SDL2_image - -find_path(SDL2_IMAGE_INCLUDE_DIR NAMES SDL_image.h PATH_SUFFIXES SDL2) -find_library(SDL2_IMAGE_LIBRARY NAMES SDL2_image) - -if(SDL2_IMAGE_INCLUDE_DIR AND SDL2_IMAGE_LIBRARY) - add_library(SDL2::SDL2_image UNKNOWN IMPORTED) - set_property(TARGET SDL2::SDL2_image PROPERTY IMPORTED_LOCATION ${SDL2_IMAGE_LIBRARY}) - set_target_properties(SDL2::SDL2_image PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${SDL2_IMAGE_INCLUDE_DIR}) - - message(STATUS "Found SDL2_image: ${SDL2_IMAGE_LIBRARY}") -else() - message(FATAL_ERROR "Could not find SDL2_image") -endif() diff --git a/cmake/FindSDL2_mixer.cmake b/cmake/FindSDL2_mixer.cmake deleted file mode 100644 index 6df3529..0000000 --- a/cmake/FindSDL2_mixer.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# SDL2::SDL2_mixer - -find_path(SDL2_MIXER_INCLUDE_DIR NAMES SDL_mixer.h PATH_SUFFIXES SDL2) -find_library(SDL2_MIXER_LIBRARY NAMES SDL2_mixer) - -if(SDL2_MIXER_INCLUDE_DIR AND SDL2_MIXER_LIBRARY) - add_library(SDL2::SDL2_mixer UNKNOWN IMPORTED) - set_property(TARGET SDL2::SDL2_mixer PROPERTY IMPORTED_LOCATION ${SDL2_MIXER_LIBRARY}) - set_target_properties(SDL2::SDL2_mixer PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${SDL2_MIXER_INCLUDE_DIR}) - - message(STATUS "Found SDL2_mixer: ${SDL2_MIXER_LIBRARY}") -else() - message(FATAL_ERROR "Could not find SDL2_mixer") -endif() diff --git a/cmake/FindSDL2_ttf.cmake b/cmake/FindSDL2_ttf.cmake deleted file mode 100644 index c2c6f17..0000000 --- a/cmake/FindSDL2_ttf.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# SDL2::SDL2_ttf - -find_path(SDL2_TTF_INCLUDE_DIR NAMES SDL_ttf.h PATH_SUFFIXES SDL2) -find_library(SDL2_TTF_LIBRARY NAMES SDL2_ttf) - -if(SDL2_TTF_INCLUDE_DIR AND SDL2_TTF_LIBRARY) - add_library(SDL2::SDL2_ttf UNKNOWN IMPORTED) - set_property(TARGET SDL2::SDL2_ttf PROPERTY IMPORTED_LOCATION ${SDL2_TTF_LIBRARY}) - set_target_properties(SDL2::SDL2_ttf PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${SDL2_TTF_INCLUDE_DIR}) - - message(STATUS "Found SDL2_ttf: ${SDL2_TTF_LIBRARY}") -else() - message(FATAL_ERROR "Could not find SDL2_ttf") -endif() diff --git a/cmake/SDL2ppConfig.cmake.in b/cmake/SDL2ppConfig.cmake.in index 0d93e15..07353ad 100644 --- a/cmake/SDL2ppConfig.cmake.in +++ b/cmake/SDL2ppConfig.cmake.in @@ -1,15 +1,15 @@ find_package(SDL2 REQUIRED) if(@SDL2PP_WITH_IMAGE@) - include("${CMAKE_CURRENT_LIST_DIR}/FindSDL2_image.cmake") + find_package(SDL2_image REQUIRED) endif() if(@SDL2PP_WITH_TTF@) - include("${CMAKE_CURRENT_LIST_DIR}/FindSDL2_ttf.cmake") + find_package(SDL2_ttf REQUIRED) endif() if(@SDL2PP_WITH_MIXER@) - include("${CMAKE_CURRENT_LIST_DIR}/FindSDL2_mixer.cmake") + find_package(SDL2_mixer REQUIRED) endif() include("${CMAKE_CURRENT_LIST_DIR}/SDL2ppTargets.cmake")