diff options
| author | Adam Tkac <atkac@redhat.com> | 2011-04-27 11:07:57 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2011-04-27 11:07:57 +0000 |
| commit | ed2ab6d8660f23835682499c7edb91eefe451f34 (patch) | |
| tree | 4bccde1aa37d29460065db4c0ddeceead5b40492 /win | |
| parent | 445d4ed0cc02266024bb6b7e450c97773069da38 (diff) | |
| download | tigervnc-ed2ab6d8660f23835682499c7edb91eefe451f34.tar.gz tigervnc-ed2ab6d8660f23835682499c7edb91eefe451f34.zip | |
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
Diffstat (limited to 'win')
| -rw-r--r-- | win/installer/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | win/installer/tigervnc.iss.in | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/win/installer/CMakeLists.txt b/win/installer/CMakeLists.txt index ab9c0859..91781303 100644 --- 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 2d967a45..18d1c329 100644 --- 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] |