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:
Jan Steemann 2015-04-20 11:32:41 +02:00
parent 61499432b7 bd27d57ce0
commit 57a53e2b11
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -387,7 +387,7 @@ endif ()
### @brief project source
################################################################################
include_directories(${PROJECT_SOURCE_DIR})
include_directories(${PROJECT_SOURCE_DIR} ${CUSTOM_INCLUDES})
## -----------------------------------------------------------------------------
## --SECTION-- COMMON MACROS

3
GNUmakefile
View File

@ -144,7 +144,7 @@ pack-macosxcode:
./configure \
--prefix=/opt/arangodb
${MAKE} -f GNUMakefile pack-macosxcode-cmake
${MAKE} -f GNUMakefile pack-macosxcode-cmake CMAKE_ARGS=$(CMAKE_ARGS)
pack-macosxcode-cmake:
cd Build && cmake \
@ -159,6 +159,7 @@ pack-macosxcode-cmake:
-D "V8_VERSION=${V8_VERSION}" \
-D "ZLIB_VERSION=${ZLIB_VERSION}" \
-G Xcode \
${CMAKE_ARGS) \
..
################################################################################