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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-05-11 14:17:51 +02:00
parent 4ca4832321 7bf01f05ad
commit 411f05a1b3
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -403,7 +403,8 @@ endif ()
## JEMALLOC ## JEMALLOC
################################################################################ ################################################################################
set(JEMALLOC_DEFAULT_VALUE ON) find_package(jemalloc)
set(JEMALLOC_DEFAULT_VALUE ${JEMALLOC_FOUND})
if (WINDOWS OR SOLARIS OR USE_TCMALLOC) if (WINDOWS OR SOLARIS OR USE_TCMALLOC)
set(JEMALLOC_DEFAULT_VALUE OFF) set(JEMALLOC_DEFAULT_VALUE OFF)
@ -415,15 +416,11 @@ option(USE_JEMALLOC
) )
if (USE_JEMALLOC) if (USE_JEMALLOC)
find_package(jemalloc) if (NOT JEMALLOC_FOUND)
message(FATAL_ERROR "jemalloc build was requested but jemalloc not found")
if (JEMALLOC_FOUND) endif ()
add_definitions("-DARANGODB_HAVE_JEMALLOC=1") add_definitions("-DARANGODB_HAVE_JEMALLOC=1")
set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_jemalloc_LIBRARY}) set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_jemalloc_LIBRARY})
message(STATUS "Found JEMALLOC")
else ()
message(STATUS "Missing JEMALLOC")
endif ()
endif () endif ()
################################################################################ ################################################################################

2
cmake/ArangoDBMacros.cmake
View File

@ -317,7 +317,7 @@ if (NOT(MSVC))
install( install(
FILES ${PROJECT_SOURCE_DIR}/Installation/debian/arangodb.init FILES ${PROJECT_SOURCE_DIR}/Installation/debian/arangodb.init
PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
DESTINATION etc/init.d DESTINATION ${ETCDIR}/init.d
RENAME arangodb3 RENAME arangodb3
COMPONENT debian-extras COMPONENT debian-extras
) )

2
scripts/build-deb.sh
View File

@ -4,7 +4,7 @@ set -e
mkdir -p build-debian mkdir -p build-debian
cd build-debian cd build-debian
cmake -DCMAKE_BUILD_TYPE=RelWithDebug -DCMAKE_SKIP_RPATH=On -DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off -DETCDIR=/etc -DCMAKE_INSTALL_PREFIX=/usr -DVARDIR=/var .. cmake -DCMAKE_BUILD_TYPE=RelWithDebug -DCMAKE_SKIP_RPATH=On -DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off -DETCDIR=/etc -DCMAKE_INSTALL_PREFIX=/usr -DVARDIR=/var -DUSE_JEMALLOC=On ..
make -j12 make -j12
cpack -G DEB --verbose cpack -G DEB --verbose
cd .. cd ..