Skip to content
Snippets Groups Projects
Commit 2d2c9015 authored by Rider Linden's avatar Rider Linden
Browse files

Remove ares dependency from build.

parent 1888142c
Branches
Tags
No related merge requests found
...@@ -87,60 +87,6 @@ ...@@ -87,60 +87,6 @@
<key>version</key> <key>version</key>
<string>1.4.5.297252</string> <string>1.4.5.297252</string>
</map> </map>
<key>ares</key>
<map>
<key>copyright</key>
<string>Copyright 1998 by the Massachusetts Institute of Technology.</string>
<key>description</key>
<string>C-ares, an asynchronous resolver library.</string>
<key>license</key>
<string>c-ares</string>
<key>license_file</key>
<string>LICENSES/c-ares.txt</string>
<key>name</key>
<string>ares</string>
<key>platforms</key>
<map>
<key>darwin</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>637b4996f703f3e5bf835d847fc4cb81</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/ares_3p-update-ares/rev/295506/arch/Darwin/installer/ares-1.10.0.295506-darwin-295506.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
</map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>7771d3653a0daf22d35bf96055d02d9a</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/ares_3p-update-ares/rev/295506/arch/Linux/installer/ares-1.10.0.295506-linux-295506.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>f044de05e704d3f3fb6934adf42447c2</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/ares_3p-update-ares/rev/295506/arch/CYGWIN/installer/ares-1.10.0.295506-windows-295506.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
<string>1.10.0.295506</string>
</map>
<key>boost</key> <key>boost</key>
<map> <map>
<key>copyright</key> <key>copyright</key>
......
...@@ -51,7 +51,6 @@ Compilation ...@@ -51,7 +51,6 @@ Compilation
WINVER=0x0501 " " WINVER=0x0501 " "
_WIN32_WINNT=0x0501 " " _WIN32_WINNT=0x0501 " "
LL_OS_DRAGDROP_ENABLED=1 " " LL_OS_DRAGDROP_ENABLED=1 " "
CARES_STATICLIB " "
LIB_NDOF=1 " " LIB_NDOF=1 " "
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
...@@ -109,7 +108,6 @@ Compilation ...@@ -109,7 +108,6 @@ Compilation
DEBUG_INFO=1 DEBUG_INFO=1
LL_DARWIN=1 " " LL_DARWIN=1 " "
LL_OS_DRAGDROP_ENABLED=1 " " LL_OS_DRAGDROP_ENABLED=1 " "
CARES_STATICLIB " "
LIB_NDOF=1 " " LIB_NDOF=1 " "
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
......
# -*- cmake -*-
include(Linking)
include(Prebuilt)
set(CARES_FIND_QUIETLY ON)
set(CARES_FIND_REQUIRED ON)
if (USESYSTEMLIBS)
include(FindCARes)
else (USESYSTEMLIBS)
use_prebuilt_binary(ares)
add_definitions("-DCARES_STATICLIB")
if (WINDOWS)
set(CARES_LIBRARIES areslib)
elseif (DARWIN)
set(CARES_LIBRARIES cares)
else (WINDOWS)
set(CARES_LIBRARIES cares)
endif (WINDOWS)
set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
endif (USESYSTEMLIBS)
...@@ -13,7 +13,6 @@ set(cmake_SOURCE_FILES ...@@ -13,7 +13,6 @@ set(cmake_SOURCE_FILES
BerkeleyDB.cmake BerkeleyDB.cmake
Boost.cmake Boost.cmake
BuildVersion.cmake BuildVersion.cmake
CARes.cmake
CMakeCopyIfDifferent.cmake CMakeCopyIfDifferent.cmake
ConfigurePkgConfig.cmake ConfigurePkgConfig.cmake
CURL.cmake CURL.cmake
...@@ -27,7 +26,6 @@ set(cmake_SOURCE_FILES ...@@ -27,7 +26,6 @@ set(cmake_SOURCE_FILES
FindAPR.cmake FindAPR.cmake
FindAutobuild.cmake FindAutobuild.cmake
FindBerkeleyDB.cmake FindBerkeleyDB.cmake
FindCARes.cmake
FindFMODEX.cmake FindFMODEX.cmake
FindGLH.cmake FindGLH.cmake
FindGoogleBreakpad.cmake FindGoogleBreakpad.cmake
......
# -*- cmake -*-
# - Find c-ares
# Find the c-ares includes and library
# This module defines
# CARES_INCLUDE_DIR, where to find ares.h, etc.
# CARES_LIBRARIES, the libraries needed to use c-ares.
# CARES_FOUND, If false, do not try to use c-ares.
# also defined, but not for general use are
# CARES_LIBRARY, where to find the c-ares library.
FIND_PATH(CARES_INCLUDE_DIR ares.h
/usr/local/include
/usr/include
)
SET(CARES_NAMES ${CARES_NAMES} cares)
FIND_LIBRARY(CARES_LIBRARY
NAMES ${CARES_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
SET(CARES_LIBRARIES ${CARES_LIBRARY})
SET(CARES_FOUND "YES")
ELSE (CARES_LIBRARY AND CARES_INCLUDE_DIR)
SET(CARES_FOUND "NO")
ENDIF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
IF (CARES_FOUND)
IF (NOT CARES_FIND_QUIETLY)
MESSAGE(STATUS "Found c-ares: ${CARES_LIBRARIES}")
ENDIF (NOT CARES_FIND_QUIETLY)
ELSE (CARES_FOUND)
IF (CARES_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find c-ares library")
ENDIF (CARES_FIND_REQUIRED)
ENDIF (CARES_FOUND)
# Deprecated declarations.
SET (NATIVE_CARES_INCLUDE_PATH ${CARES_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_CARES_LIB_PATH ${CARES_LIBRARY} PATH)
MARK_AS_ADVANCED(
CARES_LIBRARY
CARES_INCLUDE_DIR
)
# -*- cmake -*- # -*- cmake -*-
include(CARes)
include(CURL) include(CURL)
include(OpenSSL) include(OpenSSL)
include(Boost) include(Boost)
set(LLCOREHTTP_INCLUDE_DIRS set(LLCOREHTTP_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llcorehttp ${LIBS_OPEN_DIR}/llcorehttp
${CARES_INCLUDE_DIRS}
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS}
${BOOST_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
......
# -*- cmake -*- # -*- cmake -*-
include(CARes)
include(CURL) include(CURL)
include(OpenSSL) include(OpenSSL)
include(XmlRpcEpi) include(XmlRpcEpi)
set(LLMESSAGE_INCLUDE_DIRS set(LLMESSAGE_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llmessage ${LIBS_OPEN_DIR}/llmessage
${CARES_INCLUDE_DIRS}
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS}
) )
......
...@@ -5,7 +5,6 @@ project(llcorehttp) ...@@ -5,7 +5,6 @@ project(llcorehttp)
include(00-Common) include(00-Common)
include(GoogleMock) include(GoogleMock)
include(CURL) include(CURL)
include(CARes)
include(OpenSSL) include(OpenSSL)
include(ZLIB) include(ZLIB)
include(LLCoreHttp) include(LLCoreHttp)
...@@ -91,7 +90,6 @@ add_library (llcorehttp ${llcorehttp_SOURCE_FILES}) ...@@ -91,7 +90,6 @@ add_library (llcorehttp ${llcorehttp_SOURCE_FILES})
target_link_libraries( target_link_libraries(
llcorehttp llcorehttp
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${CARES_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES} ${CRYPTO_LIBRARIES}
${BOOST_THREAD_LIBRARY} ${BOOST_THREAD_LIBRARY}
...@@ -129,7 +127,6 @@ if (LL_TESTS) ...@@ -129,7 +127,6 @@ if (LL_TESTS)
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${GOOGLEMOCK_LIBRARIES} ${GOOGLEMOCK_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${CARES_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES} ${CRYPTO_LIBRARIES}
${BOOST_SYSTEM_LIBRARY} ${BOOST_SYSTEM_LIBRARY}
...@@ -161,7 +158,6 @@ if (LL_TESTS) ...@@ -161,7 +158,6 @@ if (LL_TESTS)
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${GOOGLEMOCK_LIBRARIES} ${GOOGLEMOCK_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${CARES_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES} ${CRYPTO_LIBRARIES}
${BOOST_SYSTEM_LIBRARY} ${BOOST_SYSTEM_LIBRARY}
......
...@@ -209,7 +209,6 @@ target_link_libraries( ...@@ -209,7 +209,6 @@ target_link_libraries(
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${LLVFS_LIBRARIES} ${LLVFS_LIBRARIES}
${LLMATH_LIBRARIES} ${LLMATH_LIBRARIES}
${CARES_LIBRARIES}
${JSONCPP_LIBRARIES} ${JSONCPP_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES} ${CRYPTO_LIBRARIES}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment