From 2d92e15497dc4713d15dd2632c408244b3bd1c05 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 24 Dec 2014 09:01:36 +0100 Subject: [PATCH] removed TRI_ICU_VERSION --- CMakeLists.txt | 4 ---- arangosh/V8Client/arangosh.cpp | 5 ++--- configure.ac | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d00ca65153..1a2432cd25 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -434,8 +434,6 @@ endif () ### @brief ICU ################################################################################ -set(ICU_VERSION "52.1" CACHE string "ICU version") - if (MSVC) set(ICU_LIBS "icui18n;icuuc;icudata" CACHE path "ICU libraries") @@ -466,8 +464,6 @@ if (ICU_LIB_PATH) link_directories(${ICU_LIB_PATH}) endif () -add_definitions("-DTRI_ICU_VERSION=\"${ICU_VERSION}\"") - ################################################################################ ### @brief LIBEV ################################################################################ diff --git a/arangosh/V8Client/arangosh.cpp b/arangosh/V8Client/arangosh.cpp index b68e349f38..41e1154d76 100644 --- a/arangosh/V8Client/arangosh.cpp +++ b/arangosh/V8Client/arangosh.cpp @@ -48,6 +48,7 @@ #include "Rest/Endpoint.h" #include "Rest/InitialiseRest.h" #include "Rest/HttpResponse.h" +#include "Rest/Version.h" #include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpResult.h" #include "V8/JSLoader.h" @@ -2060,9 +2061,7 @@ bool print_helo(bool useServer, bool promptError) { info << ", READLINE " << TRI_READLINE_VERSION; #endif -#ifdef TRI_ICU_VERSION - info << ", ICU " << TRI_ICU_VERSION; -#endif + info << ", ICU " << Version::getICUVersion(); BaseClient.printLine(info.str(), true); BaseClient.printLine("", true); diff --git a/configure.ac b/configure.ac index 789dea6eac..dbea1ab060 100644 --- a/configure.ac +++ b/configure.ac @@ -273,7 +273,7 @@ dnl ICU dnl ---------------------------------------------------------------------------- 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="" if test "x$tr_DARWIN" = xyes; then