Mercurial > trustbridge
comparison ui/CMakeLists.txt @ 910:eaed02defe6a
More SSLConnection refactoring. Fixes curl downloader.
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Mon, 18 Aug 2014 18:51:33 +0200 |
parents | d1c951b3012d |
children | 68db3a46ae36 |
comparison
equal
deleted
inserted
replaced
909:18e3ad073b38 | 910:eaed02defe6a |
---|---|
24 ${CMAKE_CURRENT_SOURCE_DIR}/downloader.cpp | 24 ${CMAKE_CURRENT_SOURCE_DIR}/downloader.cpp |
25 ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection_bare.cpp | 25 ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection_bare.cpp |
26 ${CMAKE_CURRENT_SOURCE_DIR}/sslhelp.cpp | 26 ${CMAKE_CURRENT_SOURCE_DIR}/sslhelp.cpp |
27 ) | 27 ) |
28 | 28 |
29 if (${CURL_FOUND}) | 29 if (${CURL_FOUND} AND ${USE_CURL}) |
30 set(UICOMMON_SOURCES ${UICOMMON_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection_curl.cpp) | 30 set(UICOMMON_SOURCES ${UICOMMON_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection_curl.cpp) |
31 add_definitions(-DUSE_CURL) | 31 add_definitions(-DUSE_CURL) |
32 elseif (${USE_CURL}) | |
33 MESSAGE(FATAL_ERROR "libcurl not found but usage of curl is requested.") | |
32 else() | 34 else() |
33 MESSAGE(STATUS "Warning curl not found only bare polarssl ssl will be supported.") | 35 MESSAGE(FATAL_ERROR "${CURL_FOUND} ${USE_CURL}") |
34 endif() | 36 endif() |
35 | 37 |
36 # Cmake does not correctly identify gcc windres when cross compiling | 38 # Cmake does not correctly identify gcc windres when cross compiling |
37 # making this line neccessary to set the correct flags for it. | 39 # making this line neccessary to set the correct flags for it. |
38 # See: http://public.kitware.com/Bug/view.php?id=11773 | 40 # See: http://public.kitware.com/Bug/view.php?id=11773 |