From 285b9e1d594e38711e42392edab7e1340b357fd6 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Sat, 20 Jul 2013 08:44:51 -0700 Subject: [PATCH] Add jemalloc and libintl include dirs to path Remove bad defines for jemalloc on macosx --- CMake/HPHPFindLibs.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake index db8821c18..f79a79f0b 100644 --- a/CMake/HPHPFindLibs.cmake +++ b/CMake/HPHPFindLibs.cmake @@ -183,6 +183,9 @@ if (USE_JEMALLOC AND NOT GOOGLE_TCMALLOC_ENABLED) message(STATUS "Found jemalloc: ${JEMALLOC_LIB}") set(JEMALLOC_ENABLED 1) endif() + if (JEMALLOC_INCLUDE_DIR) + include_directories(${JEMALLOC_INCLUDE_DIR}) + endif() endif() if (USE_TCMALLOC AND NOT JEMALLOC_ENABLED AND NOT GOOGLE_TCMALLOC_ENABLED) @@ -197,9 +200,6 @@ endif() if (JEMALLOC_ENABLED) add_definitions(-DUSE_JEMALLOC=1) - if (APPLE) - add_definitions(-DJEMALLOC_MANGLE=1 -DJEMALLOC_EXPERIMENTAL=1) - endif() else() add_definitions(-DNO_JEMALLOC=1) endif() @@ -335,6 +335,9 @@ endif() if (APPLE) find_library(LIBINTL_LIBRARIES NAMES intl libintl) + if (LIBINTL_INCLUDE_DIR) + include_directories(${LIBINTL_INCLUDE_DIR}) + endif() find_library(KERBEROS_LIB NAMES gssapi_krb5) endif()