Merge r4341 from 1_1 branch (dcommander):

Include GnuTLS DLLs in the installer, because the DLLs are required when building TigerVNC's TLS support using Visual C++.

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

diff --git a/win/installer/CMakeLists.txt b/win/installer/CMakeLists.txt
index ab9c08597bb76fc76385a5c80a4b77c39a64d6d1..917813038e3f48bd3f0c9885915ef2caa07b865b 100644 (file)
--- a/win/installer/CMakeLists.txt
+++ b/win/installer/CMakeLists.txt
@@ -21,6 +21,10 @@ if(BUILD_WINVNC)
   set(INST_DEPS ${INST_DEPS} winvnc4 wm_hooks vncconfig)
 endif()
 
+if(GNUTLS_FOUND AND NOT GNUTLS_STATIC)
+  set(INST_DEFS ${INST_DEFS})
+endif()
+
 configure_file(tigervnc.iss.in tigervnc.iss)
 
 add_custom_target(installer

diff --git a/win/installer/tigervnc.iss.in b/win/installer/tigervnc.iss.in
index 2d967a4523954c711b66f81d73c4f809c69ccf3e..18d1c329e0a404d711d51b5cc8892c27b0ddd08f 100644 (file)
--- a/win/installer/tigervnc.iss.in
+++ b/win/installer/tigervnc.iss.in
@@ -27,6 +27,12 @@ Source: "@CMAKE_CURRENT_BINARY_DIR@\win\vncconfig\{#BUILD_DIR}vncconfig.exe"; De
 Source: "@CMAKE_CURRENT_BINARY_DIR@\win\vncviewer\{#BUILD_DIR}vncviewer.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace; 
 Source: "@CMAKE_SOURCE_DIR@\win\README_BINARY.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "@CMAKE_SOURCE_DIR@\LICENCE.txt"; DestDir: "{app}"; Flags: ignoreversion
+#ifdef HAVE_GNUTLS
+Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libgnutls-*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libgcrypt-*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libtasn1-*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "@GNUTLS_INCLUDE_DIRS@\..\bin\libgpg-error-*.dll"; DestDir: "{app}"; Flags: ignoreversion
+#endif
 
 
 [Icons]