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:
Kaveh Vahedipour 2017-01-03 18:26:06 +01:00
parent f66688c397 a1e6b4f220
commit e04b092369
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -498,31 +498,51 @@ endif ()
################################################################################ ################################################################################
## JEMALLOC ## JEMALLOC
################################################################################ ################################################################################
set(DEFAULT_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
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)
endif () endif ()
option(USE_JEMALLOC option(USE_JEMALLOC
"use JEMALLOC if the library is available" "use JEMALLOC if the library is available"
${JEMALLOC_DEFAULT_VALUE} ${JEMALLOC_DEFAULT_VALUE}
) )
# mop: FORCE_JEMALLOC_LIB removed...set JEMALLOC_jemalloc_LIBRARY instead # try to detect a static libjemalloc.a:
if (USE_JEMALLOC) set(_DEFAULT_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
if (NOT JEMALLOC_FOUND) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
message(FATAL_ERROR "jemalloc build was requested but jemalloc not found") find_package(jemalloc)
endif () set(CMAKE_FIND_LIBRARY_SUFFIXES ${_DEFAULT_LIBRARY_SUFFIXES})
add_definitions("-DARANGODB_HAVE_JEMALLOC=1")
# check whether we can use the static jemalloc on the system (if):
if (JEMALLOC_FOUND)
set(HAS_PROPER_STATIC_JEMALLOC TRUE)
set(SOURCE "#include <stdlib.h>
#include <jemalloc/jemalloc.h>
int main() {
malloc_stats_print(NULL, NULL, NULL);
return 0; }"
)
set(TSTSRC "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/jemalloc.cxx")
file(WRITE ${TSTSRC} "${SOURCE}\n")
try_compile(HAS_PROPER_STATIC_JEMALLOC
${CMAKE_BINARY_DIR}
${TSTSRC}
LINK_LIBRARIES "jemalloc.a" "pthread"
)
if (USE_JEMALLOC AND NOT HAS_PROPER_STATIC_JEMALLOC)
message(FATAL_ERROR "the static system jemalloc isn't suitable! Recompile with the current compiler or disable using `-DCMAKE_CXX_FLAGS=-no-pie -DCMAKE_C_FLAGS=-no-pie`")
elseif (NOT USE_JEMALLOC AND NOT HAS_PROPER_STATIC_JEMALLOC)
# the user didn't force the use, so if its broken, ignore its existance:
set(JEMALLOC_FOUND FALSE)
endif ()
endif()
if (USE_JEMALLOC AND NOT JEMALLOC_FOUND)
message(FATAL_ERROR "jemalloc build was requested but jemalloc not found")
elseif (USE_JEMALLOC AND JEMALLOC_FOUND)
add_definitions("-DARANGODB_HAVE_JEMALLOC=1")
set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_jemalloc_LIBRARY}) set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_jemalloc_LIBRARY})
endif () endif ()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${DEFAULT_LIBRARY_SUFFIXES})
################################################################################ ################################################################################
## TCMALLOC ## TCMALLOC