mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-15 14:08:42 +00:00
Fixed: cURL static version needs to be linked against libidn under Linux too
This commit is contained in:
parent
03c2225587
commit
dd8067024e
1 changed files with 18 additions and 10 deletions
|
@ -158,9 +158,9 @@ IF(WITH_NEL)
|
||||||
|
|
||||||
IF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
|
IF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
|
||||||
SET(CURL_STATIC ON)
|
SET(CURL_STATIC ON)
|
||||||
ELSE((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
|
ELSE()
|
||||||
SET(CURL_STATIC OFF)
|
SET(CURL_STATIC OFF)
|
||||||
ENDIF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
|
ENDIF()
|
||||||
|
|
||||||
IF(CURL_STATIC)
|
IF(CURL_STATIC)
|
||||||
SET(CURL_DEFINITIONS -DCURL_STATICLIB)
|
SET(CURL_DEFINITIONS -DCURL_STATICLIB)
|
||||||
|
@ -172,15 +172,23 @@ IF(WITH_NEL)
|
||||||
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
|
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
|
||||||
ENDIF(OPENSSL_FOUND)
|
ENDIF(OPENSSL_FOUND)
|
||||||
|
|
||||||
# CURL Macports version depends on libidn, libintl and libiconv too
|
IF(UNIX)
|
||||||
IF(APPLE)
|
# CURL depends on libidn
|
||||||
FIND_LIBRARY(IDN_LIBRARY idn)
|
FIND_LIBRARY(IDN_LIBRARY idn)
|
||||||
FIND_LIBRARY(INTL_LIBRARY intl)
|
IF(IDN_LIBRARY)
|
||||||
|
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${IDN_LIBRARY})
|
||||||
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${IDN_LIBRARY} ${INTL_LIBRARY})
|
ENDIF()
|
||||||
ENDIF(APPLE)
|
|
||||||
ENDIF(CURL_STATIC)
|
# CURL Macports version depends on libidn, libintl and libiconv too
|
||||||
ENDIF(WITH_GUI)
|
IF(APPLE)
|
||||||
|
FIND_LIBRARY(INTL_LIBRARY intl)
|
||||||
|
IF(INTL_LIBRARY)
|
||||||
|
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${INTL_LIBRARY})
|
||||||
|
ENDIF()
|
||||||
|
ENDIF()
|
||||||
|
ENDIF()
|
||||||
|
ENDIF()
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
Loading…
Reference in a new issue