summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2014-10-17 13:54:32 +0200
committerPierre Ossman <ossman@cendio.se>2014-10-17 13:54:32 +0200
commit428de117942586bd1bde740c070a8ce6b3ae23e0 (patch)
treee1e27860ac83b108f57bb25508f33b905c9c5bdc /common
parent42c379ef3cda9e002970a6888a256d349d3e3b39 (diff)
downloadtigervnc-428de117942586bd1bde740c070a8ce6b3ae23e0.tar.gz
tigervnc-428de117942586bd1bde740c070a8ce6b3ae23e0.zip
Move ws2_32 dependency to the correct place
It is rdr and network that needs it, not vncviewer.
Diffstat (limited to 'common')
-rw-r--r--common/network/CMakeLists.txt4
-rw-r--r--common/rdr/CMakeLists.txt4
2 files changed, 6 insertions, 2 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})