diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-06-20 22:54:53 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 03:30:11 +0100 |
| commit | c0f56fbfd87172eec5073729f98b42434c8364a2 (patch) | |
| tree | 074f603d8c13d1d252d3ef5a6a500657270cbfd7 | |
| parent | a3faa57f3b623cfb7eafa56745d93d66061e2f35 (diff) | |
Core/Misc: Add valgrind support for jemalloc
Set CMake option VALGRIND to add valgrind support to jemalloc. Set CMake parameter VALGRIND_INCLUDE_DIR to the valgrind include directory.
(cherry picked from commit 60a29f761467c0ac76129f2f761ca0de9e7d237d)
| -rw-r--r-- | cmake/showoptions.cmake | 7 | ||||
| -rw-r--r-- | dep/jemalloc/CMakeLists.txt | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index 87a372260a0..ea202e3ace7 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -106,6 +106,13 @@ if ( NOJEM ) message(" *** jemalloc linking has been disabled!") message(" *** Please note that this is for DEBUGGING WITH VALGRIND only!") message(" *** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!") +elseif ( VALGRIND ) + message("") + message(" *** VALGRIND - WARNING!") + message(" *** jemalloc will be configured to support Valgrind") + message(" *** Please specify the valgrind include directory in VALGRIND_INCLUDE_DIR option if you get build errors") + message(" *** Please note that this is for DEBUGGING WITH VALGRIND only!") + add_definitions(-DJEMALLOC_VALGRIND) endif() if ( HELGRIND ) diff --git a/dep/jemalloc/CMakeLists.txt b/dep/jemalloc/CMakeLists.txt index db3c18dbb02..8f0692fc82c 100644 --- a/dep/jemalloc/CMakeLists.txt +++ b/dep/jemalloc/CMakeLists.txt @@ -53,6 +53,7 @@ set(jemalloc_STAT_SRC include_directories( ${BUILDDIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/include + ${VALGRIND_INCLUDE_DIR} ) add_definitions(-D_GNU_SOURCE -D_REENTRANT) |