From 428de117942586bd1bde740c070a8ce6b3ae23e0 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 17 Oct 2014 13:54:32 +0200
Subject: [PATCH] Move ws2_32 dependency to the correct place

It is rdr and network that needs it, not vncviewer.
---
 common/network/CMakeLists.txt | 4 ++++
 common/rdr/CMakeLists.txt     | 4 ++--
 vncviewer/CMakeLists.txt      | 7 -------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
index ddde5745..b624c8e6 100644
--- a/common/network/CMakeLists.txt
+++ b/common/network/CMakeLists.txt
@@ -3,6 +3,10 @@ include_directories(${CMAKE_SOURCE_DIR}/common)
 add_library(network STATIC
   TcpSocket.cxx)
 
+if(WIN32)
+	target_link_libraries(network ws2_32)
+endif()
+
 if(UNIX)
   libtool_create_control_file(network)
 endif()
diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
index ee71a9bb..cc45f911 100644
--- a/common/rdr/CMakeLists.txt
+++ b/common/rdr/CMakeLists.txt
@@ -17,9 +17,9 @@ add_library(rdr STATIC
 set(RDR_LIBRARIES ${ZLIB_LIBRARIES} os)
 if(GNUTLS_FOUND)
   set(RDR_LIBRARIES ${RDR_LIBRARIES} ${GNUTLS_LIBRARIES})
-  if(WIN32)
+endif()
+if(WIN32)
 	set(RDR_LIBRARIES ${RDR_LIBRARIES} ws2_32)
-  endif()
 endif()
 
 target_link_libraries(rdr ${RDR_LIBRARIES})
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index beca98d1..c6e778f1 100644
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -48,13 +48,6 @@ 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_DIR})
 if(UNIX)
   install(FILES vncviewer.man DESTINATION ${MAN_DIR}/man1 RENAME vncviewer.1)
-- 
2.39.5