From e34a958b5e10690e18461e7d7d70a0fe83ac28ba Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 12 Nov 2022 15:10:23 +0100
Subject: a

---
 .github/workflows/cmake.yml | 5 ++++-
 loader/CMakeLists.txt       | 6 ++++++
 src/CMakeLists.txt          | 7 -------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index e2758877..a0425ffa 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -37,7 +37,10 @@ jobs:
       if: matrix.os != 'ubuntu-22.04'
 
     - name: Install Linux Dependencies
-      run: sudo /bin/sh -c 'set -e; apt update; apt install libopencv-dev libgl-dev g++-12 ninja-build'
+      run: |
+        set -e
+        apt update
+        apt install libopencv-dev libgl-dev g++-12 ninja-build
       if: matrix.os == 'ubuntu-22.04'
 
     - name: Configure
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 9c0b6ee7..4bba63dc 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -8,6 +8,12 @@ target_link_libraries(
     Magnum::Magnum
     Magnum::Trade
 )
+if(WIN32 OR MAGNUM_BUILD_PLUGINS_STATIC)
+    target_link_libraries(${self} PUBLIC
+        MagnumPlugins::StbImageImporter
+        Magnum::TgaImporter
+    )
+endif()
 if(WIN32)
     target_link_libraries(${self} PUBLIC ntdll)
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f73bfad..c994aacb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,10 +10,3 @@ target_link_libraries(
 if(FLOORMAT_PRECOMPILED-HEADERS)
     target_precompile_headers(${self} PRIVATE precomp.hpp)
 endif()
-
-if(WIN32 OR MAGNUM_BUILD_PLUGINS_STATIC)
-    target_link_libraries(${self} PUBLIC
-        MagnumPlugins::StbImageImporter
-        Magnum::TgaImporter
-    )
-endif()
-- 
cgit v1.2.3