From 8e5471480cc14ff9efb887bccf4a61112aad7d27 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Tue, 1 Nov 2022 15:41:41 +0100 Subject: [PATCH] fix vcpkg sdl package not properly exposing linkage flags --- .github/workflows/cmake.yml | 1 - framework/filesystem/CMakeLists.txt | 3 +-- framework/sdl_service/CMakeLists.txt | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c149bfd..5fca518 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -136,7 +136,6 @@ jobs: - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 - # TODO: for some reason vcpkg find sdl does not work, despite the find_package REQUIRE not failing windows: timeout-minutes: 10 diff --git a/framework/filesystem/CMakeLists.txt b/framework/filesystem/CMakeLists.txt index a57ac21..0fb2154 100644 --- a/framework/filesystem/CMakeLists.txt +++ b/framework/filesystem/CMakeLists.txt @@ -38,8 +38,7 @@ if(NOT MM_HEADLESS) target_link_libraries(filesystem_service PUBLIC SDL2::SDL2 - #PRIVATE - #SDL2::SDL2main + SDL2::SDL2main #SDL2::SDL2-static ) else() diff --git a/framework/sdl_service/CMakeLists.txt b/framework/sdl_service/CMakeLists.txt index 0095ad1..125f0c4 100644 --- a/framework/sdl_service/CMakeLists.txt +++ b/framework/sdl_service/CMakeLists.txt @@ -33,8 +33,7 @@ elseif(VCPKG_TARGET_TRIPLET) target_link_libraries(sdl_service PUBLIC SDL2::SDL2 - #PRIVATE - #SDL2::SDL2main + SDL2::SDL2main #SDL2::SDL2-static ) else()