|
|
@ -114,6 +114,7 @@ ENDIF(WIN32)
|
|
|
|
FIND_PACKAGE(ZLIB REQUIRED)
|
|
|
|
FIND_PACKAGE(ZLIB REQUIRED)
|
|
|
|
FIND_PACKAGE(LibXml2 REQUIRED)
|
|
|
|
FIND_PACKAGE(LibXml2 REQUIRED)
|
|
|
|
FIND_PACKAGE(PNG REQUIRED)
|
|
|
|
FIND_PACKAGE(PNG REQUIRED)
|
|
|
|
|
|
|
|
FIND_PACKAGE(OpenSSL REQUIRED)
|
|
|
|
FIND_PACKAGE(GIF)
|
|
|
|
FIND_PACKAGE(GIF)
|
|
|
|
FIND_PACKAGE(Jpeg)
|
|
|
|
FIND_PACKAGE(Jpeg)
|
|
|
|
|
|
|
|
|
|
|
@ -338,8 +339,6 @@ IF(WITH_QT5)
|
|
|
|
|
|
|
|
|
|
|
|
# Network
|
|
|
|
# Network
|
|
|
|
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Network Qt5::Xml)
|
|
|
|
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Network Qt5::Xml)
|
|
|
|
|
|
|
|
|
|
|
|
FIND_PACKAGE(OpenSSL REQUIRED)
|
|
|
|
|
|
|
|
SET(QT_LIBRARIES ${QT_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
|
|
|
|
SET(QT_LIBRARIES ${QT_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
|
|
|
|
|
|
|
|
|
|
|
|
IF(WIN32)
|
|
|
|
IF(WIN32)
|
|
|
@ -413,12 +412,8 @@ IF(WITH_NEL)
|
|
|
|
IF(CURL_STATIC)
|
|
|
|
IF(CURL_STATIC)
|
|
|
|
SET(CURL_DEFINITIONS -DCURL_STATICLIB)
|
|
|
|
SET(CURL_DEFINITIONS -DCURL_STATICLIB)
|
|
|
|
|
|
|
|
|
|
|
|
FIND_PACKAGE(OpenSSL QUIET)
|
|
|
|
SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
|
|
|
|
|
|
|
|
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
|
|
|
|
IF(OPENSSL_FOUND)
|
|
|
|
|
|
|
|
SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
|
|
|
|
|
|
|
|
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
|
|
|
|
|
|
|
|
ENDIF(OPENSSL_FOUND)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IF(UNIX)
|
|
|
|
IF(UNIX)
|
|
|
|
# CURL depends on libidn
|
|
|
|
# CURL depends on libidn
|
|
|
|