Skip to content

Commit

Permalink
Feature/jemalloc 5.0.1 (#2991)
Browse files Browse the repository at this point in the history
* updated CHANGELOG
  • Loading branch information
jsteemann authored and fceller committed Aug 10, 2017
1 parent ab5f5f4 commit 2b791af
Show file tree
Hide file tree
Showing 551 changed files with 47,768 additions and 89,402 deletions.
6 changes: 4 additions & 2 deletions 3rdParty/jemalloc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(jemalloc C)
include(ExternalProject)

# set version and paths
set(JEMALLOC_VERSION "4.5.0")
set(JEMALLOC_VERSION "5.0.1")
# set(JEMALLOC_VERSION "3.6.0")
set(JEMALLOC_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/v${JEMALLOC_VERSION}")
set(JEMALLOC_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/v${JEMALLOC_VERSION}")
Expand Down Expand Up @@ -58,8 +58,8 @@ if (LINUX OR DARWIN)
CXX=${JEMALLOC_CXX_TMP}
CFLAGS=${JEMALLOC_CFLAGS_TMP}
CXXFLAGS=${JEMALLOC_CXXFLAGS_TMP}
--enable-munmap
--prefix=${CMAKE_CURRENT_BINARY_DIR}
--with-malloc-conf=background_thread:true
--with-version=${JEMALLOC_VERSION}-0-g0
BUILD_COMMAND
make build_lib_static
Expand All @@ -70,4 +70,6 @@ if (LINUX OR DARWIN)
&& mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/lib
&& cp -a ${JEMALLOC_BINARY_DIR}/lib/libjemalloc.a ${CMAKE_CURRENT_BINARY_DIR}/lib
)

set(JEMALLOC_LIB "${JEMALLOC_BINARY_DIR}/lib/libjemalloc.a" PARENT_SCOPE)
endif ()
72 changes: 0 additions & 72 deletions 3rdParty/jemalloc/v3.6.0/.gitignore

This file was deleted.

27 changes: 0 additions & 27 deletions 3rdParty/jemalloc/v3.6.0/COPYING

This file was deleted.

Loading

0 comments on commit 2b791af

Please sign in to comment.