Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Link nelgui to Security framework (fix compilation with curl using DarwinSSL backend)

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2018-08-07 13:29:36 +02:00
parent 5385e04bba
commit a0c3a3adc5
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/CMakeLists.txt
View file

@ -167,6 +167,7 @@ ENDIF()
IF(APPLE) IF(APPLE)
FIND_LIBRARY(CARBON_FRAMEWORK Carbon) FIND_LIBRARY(CARBON_FRAMEWORK Carbon)
FIND_LIBRARY(FOUNDATION_FRAMEWORK Foundation) FIND_LIBRARY(FOUNDATION_FRAMEWORK Foundation)
FIND_LIBRARY(SECURITY_FRAMEWORK Security)
IF(APPLE_CERTIFICATE) IF(APPLE_CERTIFICATE)
# Find codesign_allocate # Find codesign_allocate
@ -226,22 +227,26 @@ IF(WITH_NEL)
IF(CURL_STATIC) IF(CURL_STATIC)
SET(CURL_DEFINITIONS -DCURL_STATICLIB) SET(CURL_DEFINITIONS -DCURL_STATICLIB)
SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR}) LIST(APPEND CURL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES}) LIST(APPEND CURL_LIBRARIES ${OPENSSL_LIBRARIES})
IF(UNIX) IF(WIN32)
LIST(APPEND CURL_LIBRARIES Crypt32 Cryptui)
ELSE()
# CURL depends on libidn # CURL depends on libidn
FIND_LIBRARY(IDN_LIBRARY idn) FIND_LIBRARY(IDN_LIBRARY idn)
IF(IDN_LIBRARY) IF(IDN_LIBRARY)
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${IDN_LIBRARY}) LIST(APPEND CURL_LIBRARIES ${IDN_LIBRARY})
ENDIF() ENDIF()
# CURL Macports version depends on libidn, libintl and libiconv too # CURL Macports version depends on libidn, libintl and libiconv too
IF(APPLE) IF(APPLE)
FIND_LIBRARY(INTL_LIBRARY intl) FIND_LIBRARY(INTL_LIBRARY intl)
IF(INTL_LIBRARY) IF(INTL_LIBRARY)
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${INTL_LIBRARY}) LIST(APPEND CURL_LIBRARIES ${INTL_LIBRARY})
ENDIF() ENDIF()
LIST(APPEND CURL_LIBRARIES ${SECURITY_FRAMEWORK})
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()

4
code/nel/src/gui/CMakeLists.txt
View file

@ -10,10 +10,6 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_
TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES}) TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
IF(WIN32)
TARGET_LINK_LIBRARIES(nelgui Crypt32 Cryptui)
ENDIF()
NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI") NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
NL_ADD_RUNTIME_FLAGS(nelgui) NL_ADD_RUNTIME_FLAGS(nelgui)