diff --git a/CHANGELOG b/CHANGELOG index 7809421ad3..b335cf02bb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -25,7 +25,6 @@ v2.3.0 (XXXX-XX-XX) arangod --server.disable-authentication true --server.endpoint tcp://127.0.0.1:8529 data - * improved performance of CSV import in arangoimp * fixed issue #1027: Stack traces are off-by-one diff --git a/CMakeLists.txt b/CMakeLists.txt index e9cd86a5a8..aacab8afcd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,7 +433,9 @@ if (MSVC) add_definitions("-DU_STATIC_IMPLEMENTATION=1") elseif (BUILD_PACKAGE STREQUAL "raspbian") - set(ICU_LIBS icui18n;icuuc;icudata;pthread;m CACHE path "ICU libraries") + set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty-ARM/icu/include CACHE path "ICU include path") + set(ICU_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty-ARM/icu/lib CACHE path "ICU library path") + set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries") set(ICU_VERSION "52.1" CACHE string "ICU version") else () set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/icu/BUILD/include CACHE path "ICU include path")