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

removed all-in-one, fixed path

This commit is contained in:
Frank Celler 2014-12-23 23:44:08 +01:00
parent 11233fd57e
commit f34aabe87a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -433,8 +433,8 @@ if (MSVC)
add_definitions("-DU_STATIC_IMPLEMENTATION=1") add_definitions("-DU_STATIC_IMPLEMENTATION=1")
elseif (BUILD_PACKAGE STREQUAL "raspbian") elseif (BUILD_PACKAGE STREQUAL "raspbian")
set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty-ARM/icu/include CACHE path "ICU include path") set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/ArmLibraries/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_LIB_PATH ${PROJECT_SOURCE_DIR}/ArmLibraries/icu/lib CACHE path "ICU library path")
set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries") set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries")
set(ICU_VERSION "52.1" CACHE string "ICU version") set(ICU_VERSION "52.1" CACHE string "ICU version")
else () else ()

6
GNUmakefile
View File

@ -177,14 +177,12 @@ pack-arm:
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var \
--enable-all-in-one-icu \
--enable-all-in-one-v8 \
--enable-all-in-one-libev \
--with-v8=./3rdParty-ARM \ --with-v8=./3rdParty-ARM \
--disable-mruby --disable-mruby
touch .icu-build-32 touch .libev-build-32
touch .v8-build-32 touch .v8-build-32
touch .zlib-build-32
${MAKE} pack-arm-cmake ${MAKE} pack-arm-cmake