Skip to content

Commit

Permalink
Remove temporary FindSDL2_* CMake scripts (#9465)
Browse files Browse the repository at this point in the history
  • Loading branch information
oleg-derevenetz authored Jan 19, 2025
1 parent 6131b39 commit 2bf9e48
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 301 deletions.
12 changes: 1 addition & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
###########################################################################
# fheroes2: https://github.com/ihhub/fheroes2 #
# Copyright (C) 2022 - 2023 #
# Copyright (C) 2022 - 2025 #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
Expand Down Expand Up @@ -59,19 +59,9 @@ find_package(${USE_SDL_VERSION}_mixer REQUIRED)
find_package(ZLIB REQUIRED)
find_package(Threads)

# TODO: Modern versions of SDL2* packages provide the CMake config files that define the SDL2::SDL2, SDL2_mixer::SDL2_mixer and SDL2_image::SDL2_image
# TODO: imported targets, but older versions do not. To solve this problem, we have to use FindSDL2*.cmake modules from the cmake/ subdirectory and
# TODO: define aliases for imported targets provided by these modules.

# TODO: remove this alias and module from the cmake/ subdirectory as soon as the distributions start shipping a newer version of SDL_mixer
add_library(${USE_SDL_VERSION}_mixer::${USE_SDL_VERSION}_mixer ALIAS ${USE_SDL_VERSION}::Mixer)

if(ENABLE_IMAGE)
find_package(${USE_SDL_VERSION}_image REQUIRED)
find_package(PNG REQUIRED)

# TODO: remove this alias and module from the cmake/ subdirectory as soon as the distributions start shipping a newer version of SDL_image
add_library(${USE_SDL_VERSION}_image::${USE_SDL_VERSION}_image ALIAS ${USE_SDL_VERSION}::Image)
endif(ENABLE_IMAGE)

#
Expand Down
110 changes: 0 additions & 110 deletions cmake/FindSDL2_image.cmake

This file was deleted.

110 changes: 0 additions & 110 deletions cmake/FindSDL2_mixer.cmake

This file was deleted.

15 changes: 0 additions & 15 deletions cmake/LICENSE

This file was deleted.

3 changes: 0 additions & 3 deletions cmake/README.md

This file was deleted.

52 changes: 0 additions & 52 deletions cmake/README_findsdl2.md

This file was deleted.

0 comments on commit 2bf9e48

Please sign in to comment.