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/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2016-07-25 16:52:48 +02:00
parent fe99ca558a 0ca7f91e49
commit ad57307bf0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdParty/V8/CMakeLists.txt vendored
View File

@ -36,6 +36,9 @@ endif()
if ("${CMAKE_TARGET_ARCHITECTURES}" STREQUAL "armv7") if ("${CMAKE_TARGET_ARCHITECTURES}" STREQUAL "armv7")
set(V8_PROC_ARCH "arm") set(V8_PROC_ARCH "arm")
list(APPEND V8_GYP_ARGS -Darm_version=7 -Darm_fpu=default -Darm_float_abi=default) list(APPEND V8_GYP_ARGS -Darm_version=7 -Darm_fpu=default -Darm_float_abi=default)
elseif("${CMAKE_TARGET_ARCHITECTURES}" STREQUAL "aarch64")
set(V8_PROC_ARCH "arm64")
list(APPEND V8_GYP_ARGS -Darm_fpu=default -Darm_float_abi=default)
else () else ()
if ("${BITS}" STREQUAL "64") if ("${BITS}" STREQUAL "64")
set(V8_PROC_ARCH "x64") set(V8_PROC_ARCH "x64")

4
3rdParty/rocksdb/rocksdb/CMakeLists.txt vendored
View File

@ -90,7 +90,11 @@ elseif (UNIX AND NOT APPLE)
set(LINUX TRUE) set(LINUX TRUE)
set(OS_DEFINE "OS_LINUX") set(OS_DEFINE "OS_LINUX")
set(POSIX_FLAG "-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX") set(POSIX_FLAG "-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX")
if (CROSS_COMPILING)
set(SYSTEM_LIBS pthread rt)
else()
set(SYSTEM_LIBS pthread rt z) set(SYSTEM_LIBS pthread rt z)
endif ()
elseif (CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*") elseif (CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*")
set(FREEBSD TRUE) set(FREEBSD TRUE)
set(OS_DEFINE "OS_FREEBSD") set(OS_DEFINE "OS_FREEBSD")