0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup cmakelists for updated vcpkg.

Browse source
This commit is contained in:
Pentarctagon 2022-12-15 15:47:59 -06:00
parent f1ee711169
commit 2ddc179ff1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -492,8 +492,8 @@ if(ENABLE_GAME OR ENABLE_TESTS)
# for MSVC, vcpkg builds and provides SDL2-related modules for cmake to use, so use those
# this also fixes the issue with our previous FindSDL2* scripts incorrectly using the Release version of these libs instead of the Debug version
find_package(SDL2 2.0.8 CONFIG REQUIRED)
find_package(sdl2-image CONFIG REQUIRED)
find_package(sdl2-mixer CONFIG REQUIRED)
find_package(SDL2_image CONFIG REQUIRED)
find_package(SDL2_mixer CONFIG REQUIRED)
endif()
pkg_check_modules(CAIRO REQUIRED cairo>=1.10)
pkg_check_modules(PANGOCAIRO REQUIRED pangocairo>=1.22.0)

8
src/CMakeLists.txt
View file

@ -189,8 +189,8 @@ if(ENABLE_GAME)
if(MSVC)
target_link_libraries(wesnoth SDL2::SDL2)
target_link_libraries(wesnoth SDL2::SDL2main)
target_link_libraries(wesnoth SDL2::SDL2_image)
target_link_libraries(wesnoth SDL2::SDL2_mixer)
target_link_libraries(wesnoth SDL2_image::SDL2_image)
target_link_libraries(wesnoth SDL2_mixer::SDL2_mixer)
endif()
if(ENABLE_DISPLAY_REVISION)
@ -236,8 +236,8 @@ if(ENABLE_TESTS)
if(MSVC)
target_link_libraries(boost_unit_tests SDL2::SDL2)
target_link_libraries(boost_unit_tests SDL2::SDL2main)
target_link_libraries(boost_unit_tests SDL2::SDL2_image)
target_link_libraries(boost_unit_tests SDL2::SDL2_mixer)
target_link_libraries(boost_unit_tests SDL2_image::SDL2_image)
target_link_libraries(boost_unit_tests SDL2_mixer::SDL2_mixer)
endif()
if(ENABLE_DISPLAY_REVISION)