summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2011-07-28 09:22:07 +0000
committerDRC <dcommander@users.sourceforge.net>2011-07-28 09:22:07 +0000
commit638314d56d2cdb27de411de99e62811ce5abb464 (patch)
tree70d9d05d9d11b1873d91294bb6ec3fdc7d7640f3
parent2ff39b848160c904dcbf5326912f8242e084b90a (diff)
downloadtigervnc-638314d56d2cdb27de411de99e62811ce5abb464.tar.gz
tigervnc-638314d56d2cdb27de411de99e62811ce5abb464.zip
Unless GnuTLS is being used, we have to explicitly link vncviewer with ws2_32 on WIN32 systems.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4604 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--vncviewer/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index 7ba029f1..b08e4217 100644
--- 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)