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

fixed issue 1028: libicu is now statically linked 

Conflicts:
	CHANGELOG
This commit is contained in:
Frank Celler 2014-10-08 10:12:25 +02:00
parent 2d97f529ae
commit 3ac1d0b336
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -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

4
CMakeLists.txt
View File

@ -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")