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 engine-api

This commit is contained in:
jsteemann 2017-03-24 09:10:00 +01:00
parent 2eeccd5f09 45a4fac4d3
commit c6f87b2d83
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdParty/CMakeLists.txt vendored
View File

@ -6,12 +6,6 @@
include(ExternalProject)
################################################################################
## boost
################################################################################
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/boost)
################################################################################
## V8 and ICU
################################################################################
@ -21,7 +15,7 @@ option(USE_PRECOMPILED_V8 "use a precompiled V8" OFF)
set(V8_SUB_DIR "v5.7.0.0")
set(V8_VERSION
"V8-${V8_SUB_DIR}"
"5.7.0.0"
CACHE INTERNAL
"${PROJECT_NAME}: Version"
FORCE

2
CMakeLists.txt
View File

@ -762,6 +762,8 @@ endif ()
# ZLIB_INCLUDE_DIR
add_definitions(-DBOOST_ALL_NO_LIB=1) #disable boost autolink on windows
add_subdirectory(3rdParty)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/boost)
add_definitions("-DARANGODB_BOOST_VERSION=\"${BOOST_VERSION}\"")
################################################################################