diff --git a/CMakeLists.txt b/CMakeLists.txt index 5954e435..c8ea0080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,6 @@ set(CMAKE_MODULE_PATH find_package(Nanopb 0.4.5...<1.0.0 REQUIRED) find_package(SDL2 REQUIRED) message("SDL2 include dir: ${SDL2_INCLUDE_DIRS}") -find_package(SDL2_image REQUIRED) find_package(SDL2_mixer REQUIRED) if(BUILD_EDITOR) find_package(OpenGL REQUIRED) @@ -291,7 +290,7 @@ elseif(APPLE) # copy SDL frameworks set(APPS cdogs-sdl cdogs-sdl-editor) - set(LIBS SDL2 SDL2_image SDL2_mixer) + set(LIBS SDL2 SDL2_mixer) foreach(APP ${APPS}) foreach(LIB ${LIBS}) install(DIRECTORY /Library/Frameworks/${LIB}.framework diff --git a/src/cdogs/CMakeLists.txt b/src/cdogs/CMakeLists.txt index 9015e0a6..d687aacf 100644 --- a/src/cdogs/CMakeLists.txt +++ b/src/cdogs/CMakeLists.txt @@ -250,6 +250,5 @@ target_link_libraries(cdogs SDL_joystickbuttonnames yajl_s SDL2::SDL2 - SDL2_image::SDL2_image SDL2_mixer::SDL2_mixer ${ENet_LIBRARIES}) diff --git a/src/cdogsed/CMakeLists.txt b/src/cdogsed/CMakeLists.txt index 2bd9464f..99da7bce 100644 --- a/src/cdogsed/CMakeLists.txt +++ b/src/cdogsed/CMakeLists.txt @@ -46,4 +46,4 @@ set(CDOGSED_HEADERS tile_brush.h ui_object.h) add_library(cdogsedlib STATIC ${CDOGSED_SOURCES} ${CDOGSED_HEADERS}) -target_link_libraries(cdogsedlib SDL2::SDL2 SDL2_image::SDL2_image SDL2_mixer::SDL2_mixer) +target_link_libraries(cdogsedlib SDL2::SDL2 SDL2_mixer::SDL2_mixer) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 4489ea51..24654b74 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -140,7 +140,6 @@ target_link_libraries(pic_test cdogs cdogs_proto SDL2::SDL2 - SDL2_image::SDL2_image ${EXTRA_LIBRARIES}) # TODO: test disabled since CI fails with Couldn't find matching render driver #add_test(NAME pic_test COMMAND pic_test)