diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 39e47f2ba4..7b900a00c5 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -226,37 +226,6 @@ function(wx_set_target_properties target_name is_base)
         )
         target_link_libraries(${target_name}
             PUBLIC ${WIN32_LIBRARIES})
-
-        if(WXGTK)
-            if(WXGTK4)
-                set(WXGTK_WIN32_LIBRARIES
-                    libgtk-4.dll.a
-                    libgdk-4.dll.a
-                )
-            elseif(WXGTK3)
-                set(WXGTK_WIN32_LIBRARIES
-                    libgtk-3.dll.a
-                    libgdk-3.dll.a
-                )
-            elseif(WXGTK2)
-                set(WXGTK_WIN32_LIBRARIES
-                    gtk-win32-2.0.lib
-                    gdk-win32-2.0.lib
-                )
-            endif()
-            set(WXGTK_WIN32_LIBRARIES ${WXGTK_WIN32_LIBRARIES}
-                gio-2.0.lib
-                pangocairo-1.0.lib
-                gdk_pixbuf-2.0.lib
-                cairo.lib
-                pango-1.0.lib
-                gobject-2.0.lib
-                gthread-2.0.lib
-                glib-2.0.lib
-            )
-            target_link_libraries(${target_name}
-                PUBLIC ${WXGTK_WIN32_LIBRARIES})
-        endif()
     endif()
 
     if(wxTOOLKIT_LIBRARIES)
diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake
index edcf0ebe69..02f9982920 100644
--- a/build/cmake/toolkit.cmake
+++ b/build/cmake/toolkit.cmake
@@ -82,6 +82,35 @@ if(WXGTK)
     list(APPEND wxTOOLKIT_DEFINITIONS ${${gtk_lib}_DEFINITIONS})
     list(APPEND wxTOOLKIT_DEFINITIONS __WXGTK__)
     set(wxTOOLKIT_VERSION ${${gtk_lib}_VERSION})
+
+    if(WIN32 AND MSVC)
+        if(WXGTK4)
+            list(APPEND wxTOOLKIT_LIBRARIES
+                libgtk-4.dll.a
+                libgdk-4.dll.a
+            )
+        elseif(WXGTK3)
+            list(APPEND wxTOOLKIT_LIBRARIES
+                libgtk-3.dll.a
+                libgdk-3.dll.a
+            )
+        elseif(WXGTK2)
+            list(APPEND wxTOOLKIT_LIBRARIES
+                gtk-win32-2.0
+                gdk-win32-2.0
+            )
+        endif()
+        list(APPEND wxTOOLKIT_LIBRARIES
+            gio-2.0
+            pangocairo-1.0
+            gdk_pixbuf-2.0
+            cairo
+            pango-1.0
+            gobject-2.0
+            gthread-2.0
+            glib-2.0
+        )
+    endif()
 endif()
 
 if(APPLE)