changeset 948:3baee3445502

Use curl without-zlib support
author Andre Heinecke <andre.heinecke@intevation.de>
date Wed, 27 Aug 2014 10:40:06 +0200
parents dbf5ea18cb20
children 0abacb0fd564
files INSTALL ui/CMakeLists.txt ui/tests/CMakeLists.txt
diffstat 3 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL	Tue Aug 26 17:04:11 2014 +0200
+++ b/INSTALL	Wed Aug 27 10:40:06 2014 +0200
@@ -74,7 +74,8 @@
     --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-dict \
     --disable-proxy --disable-rtsp --disable-ldaps --disable-ldap --disable-file \
     --disable-ftp --enable-http --enable-shared=no -enable-static=yes \
-    --with-polarssl=$YOURPREFIX --without-ca-bundle --without-ca-path
+    --with-polarssl=$YOURPREFIX --without-ca-bundle --without-ca-path \
+    --without-zlib
 
 To compile the software you can use plain cmake. An out of source build is
 highly suggested. For build options see CMakeList.txt
--- a/ui/CMakeLists.txt	Tue Aug 26 17:04:11 2014 +0200
+++ b/ui/CMakeLists.txt	Wed Aug 27 10:40:06 2014 +0200
@@ -205,7 +205,6 @@
    ui_common
    trustbridge_common
    ${CURL_LIBRARIES}
-   z
    ${POLARSSL_LIBRARIES}
    ${EXTRA_STATIC_LIBS}
    ${PROFILING_LIBS})
--- a/ui/tests/CMakeLists.txt	Tue Aug 26 17:04:11 2014 +0200
+++ b/ui/tests/CMakeLists.txt	Wed Aug 27 10:40:06 2014 +0200
@@ -48,7 +48,6 @@
      Qt5::Test Qt5::Widgets
      trustbridge_common
      ${CURL_LIBRARIES}
-     z
      ${POLARSSL_LIBRARIES}
      ${EXTRA_STATIC_LIBS})
 endmacro()

http://wald.intevation.org/projects/trustbridge/