summaryrefslogtreecommitdiffstats
path: root/vncviewer
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2014-10-21 16:29:05 +0200
committerPierre Ossman <ossman@cendio.se>2014-10-21 16:29:05 +0200
commit7f8f3ea2c4349bd78f2c2279c4d04a9505fddf64 (patch)
treeb3ac077435d4f5a6c7cfe099bb85557672a6554e /vncviewer
parentb9203b9342edcf8b209830576aee31f0445ee6fd (diff)
parentf95272de303373b3d2d55e001a0dac9a8d800407 (diff)
downloadtigervnc-7f8f3ea2c4349bd78f2c2279c4d04a9505fddf64.tar.gz
tigervnc-7f8f3ea2c4349bd78f2c2279c4d04a9505fddf64.zip
Merge branch 'build' of https://github.com/CendioOssman/tigervnc
Diffstat (limited to 'vncviewer')
-rw-r--r--vncviewer/CMakeLists.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
index beca98d1..de9da8fb 100644
--- a/vncviewer/CMakeLists.txt
+++ b/vncviewer/CMakeLists.txt
@@ -48,11 +48,8 @@ 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)
+if(APPLE)
+ target_link_libraries(vncviewer "-framework Cocoa" "-framework Carbon")
endif()
install(TARGETS vncviewer DESTINATION ${BIN_DIR})