1
0
Fork 0

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-12-11 16:35:13 +01:00
commit 8bb568e02b
1 changed files with 14 additions and 0 deletions

View File

@ -748,6 +748,20 @@ endif ()
add_definitions("-DTRI_ZLIB_VERSION=\"${ZLIB_VERSION}\"")
################################################################################
### @brief VELOCYPACK
################################################################################
set(VELOCYPACK_VERSION "unknown" CACHE string "VELOCYPACK version")
if (NOT MSVC)
set(VELOCYPACK_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/velocypack/include CACHE path "VELOCYPACK include path")
endif ()
if (VELOCYPACK_INCLUDE)
include_directories(${VELOCYPACK_INCLUDE})
endif ()
## -----------------------------------------------------------------------------
## --SECTION-- SUB-PROJECTS
## -----------------------------------------------------------------------------