Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Frank Celler 2014-12-24 10:58:25 +01:00
parent 7bb196abfe 2d92e15497
commit 44e23d8e4f
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -434,8 +434,6 @@ endif ()
### @brief ICU ### @brief ICU
################################################################################ ################################################################################
set(ICU_VERSION "52.1" CACHE string "ICU version")
if (MSVC) if (MSVC)
set(ICU_LIBS "icui18n;icuuc;icudata" CACHE path "ICU libraries") set(ICU_LIBS "icui18n;icuuc;icudata" CACHE path "ICU libraries")
@ -466,8 +464,6 @@ if (ICU_LIB_PATH)
link_directories(${ICU_LIB_PATH}) link_directories(${ICU_LIB_PATH})
endif () endif ()
add_definitions("-DTRI_ICU_VERSION=\"${ICU_VERSION}\"")
################################################################################ ################################################################################
### @brief LIBEV ### @brief LIBEV
################################################################################ ################################################################################

5
arangosh/V8Client/arangosh.cpp
View File

@ -48,6 +48,7 @@
#include "Rest/Endpoint.h" #include "Rest/Endpoint.h"
#include "Rest/InitialiseRest.h" #include "Rest/InitialiseRest.h"
#include "Rest/HttpResponse.h" #include "Rest/HttpResponse.h"
#include "Rest/Version.h"
#include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h" #include "SimpleHttpClient/SimpleHttpResult.h"
#include "V8/JSLoader.h" #include "V8/JSLoader.h"
@ -2060,9 +2061,7 @@ bool print_helo(bool useServer, bool promptError) {
info << ", READLINE " << TRI_READLINE_VERSION; info << ", READLINE " << TRI_READLINE_VERSION;
#endif #endif
#ifdef TRI_ICU_VERSION info << ", ICU " << Version::getICUVersion();
info << ", ICU " << TRI_ICU_VERSION;
#endif
BaseClient.printLine(info.str(), true); BaseClient.printLine(info.str(), true);
BaseClient.printLine("", true); BaseClient.printLine("", true);

2
configure.ac
View File

@ -273,7 +273,7 @@ dnl ICU
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
ICU_VERSION="52.2" ICU_VERSION="52.2"
ICU_CPPFLAGS="-D_REENTRANT -I${srcdir}/3rdParty/V8-3.29.59/third_party/icu/source/common -I${srcdir}/3rdParty/V8-3.29.59/third_party/icu/source/i18n -I${srcdir}/3rdParty/V8-3.29.59/third_party/icu/source/io -DTRI_ICU_VERSION='\"${ICU_VERSION}\"'" ICU_CPPFLAGS="-D_REENTRANT -I${srcdir}/3rdParty/V8-3.29.59/third_party/icu/source/common -I${srcdir}/3rdParty/V8-3.29.59/third_party/icu/source/i18n -I${srcdir}/3rdParty/V8-3.29.59/third_party/icu/source/io"
ICU_LDFLAGS="" ICU_LDFLAGS=""
if test "x$tr_DARWIN" = xyes; then if test "x$tr_DARWIN" = xyes; then