[PATCH 4 of 8] (issue41) Add curl staticlib definition

Wald Commits scm-commit at wald.intevation.org
Wed Aug 27 16:33:21 CEST 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1409149795 -7200
# Node ID eaea1504f2827cad0ee12db60e07623ae6443c80
# Parent  f2066a24047dcd3ea065f3238c47d6473904f79d
(issue41) Add curl staticlib definition

    This is neccessary to avoid dllimport declarations on windows.

diff -r f2066a24047d -r eaea1504f282 ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Wed Aug 27 16:29:16 2014 +0200
+++ b/ui/CMakeLists.txt	Wed Aug 27 16:29:55 2014 +0200
@@ -28,7 +28,7 @@
 
 if (${CURL_FOUND} AND ${USE_CURL})
    set(UICOMMON_SOURCES ${UICOMMON_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection_curl.cpp)
-   add_definitions(-DUSE_CURL)
+   add_definitions(-DUSE_CURL -DCURL_STATICLIB)
 elseif (${USE_CURL})
    MESSAGE(FATAL_ERROR "libcurl not found but usage of curl is requested.")
 endif()
diff -r f2066a24047d -r eaea1504f282 ui/certs.qrc
--- a/ui/certs.qrc	Wed Aug 27 16:29:16 2014 +0200
+++ b/ui/certs.qrc	Wed Aug 27 16:29:55 2014 +0200
@@ -1,5 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/certs">
     <file alias="intevation.de">certificates/intevation.de.der</file>
+    <file alias="geotrust">certificates/geotrust.der</file>
 </qresource>
 </RCC>


More information about the Trustbridge-commits mailing list