Mercurial > trustbridge
changeset 954:eaea1504f282
(issue41) Add curl staticlib definition
This is neccessary to avoid dllimport declarations on windows.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 27 Aug 2014 16:29:55 +0200 |
| parents | f2066a24047d |
| children | 0f7aeb12e5e9 |
| files | ui/CMakeLists.txt ui/certs.qrc |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- 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>