Unless GnuTLS is being used, we have to explicitly link vncviewer with ws2_32 on...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4604 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 7ba029f14c64dab8858bc5b795cdf1deda590b4d..b08e42176aa4275a0193209644235b72ccaa058c 100644 (file)
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -40,6 +40,13 @@ if(USE_INCLUDED_FLTK)
 endif()
 target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
 
+# When building with GnuTLS, librdr depends on ws2_32, so in order to make
+# MinGW happy, we need to put ws2_32 in librdr's target_link_libraries string,
+# not here.
+if(NOT GNUTLS_FOUND AND WIN32)
+  target_link_libraries(vncviewer ws2_32)
+endif()
+
 install(TARGETS vncviewer DESTINATION bin)
 if(UNIX)
   install(FILES vncviewer.man DESTINATION man/man1 RENAME vncviewer.1)