From 2f5047059182069e5128d20aeb67203f101c167e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Sat, 26 Nov 2022 14:52:39 +0100 Subject: [PATCH] Fix for linking to SDL --- CMakeLists.txt | 6 +++--- src/CMakeLists.txt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 997005b8..477b14cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,9 +307,9 @@ include("${colobot_SOURCE_DIR}/cmake/colobot-lint.cmake") ## find_package(OpenGL 1.4 REQUIRED) -find_package(SDL2 REQUIRED) -find_package(SDL2_image REQUIRED) -find_package(SDL2_ttf REQUIRED) +find_package(SDL2 CONFIG REQUIRED) +find_package(SDL2_image CONFIG REQUIRED) +find_package(SDL2_ttf CONFIG REQUIRED) find_package(PNG 1.2 REQUIRED) find_package(Gettext REQUIRED) find_package(PhysFS REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1df04d13..a8e5545c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -487,9 +487,9 @@ target_include_directories(colobotbase PUBLIC target_link_libraries(colobotbase PUBLIC CBot localename - SDL2::Core - SDL2::Image - SDL2::TTF + $,SDL2::SDL2,SDL2::SDL2-static> + $,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static> + $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static> OpenGL::GL PNG::PNG GLEW::GLEW @@ -610,7 +610,7 @@ endif() if(PLATFORM_WINDOWS) target_sources(colobot PRIVATE ../desktop/colobot.rc) endif() -target_link_libraries(colobot colobotbase SDL2::Main) +target_link_libraries(colobot colobotbase SDL2::SDL2main) # Install install(TARGETS colobot RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR})