From 20b79fec28663e8265c3eb9fcfe03be9859c63aa Mon Sep 17 00:00:00 2001 From: raczman Date: Sat, 24 Apr 2010 14:20:28 +0200 Subject: [PATCH] Don't build jemalloc on mac. --HG-- branch : trunk --- CMakeLists.txt | 1 + dep/src/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5b5a7e668d..e0c335711b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,7 @@ ENDIF(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") + SET(MACOSX 1) SET(OSX_LIBS /opt/local/lib/libcrypto.dylib) add_definitions(-D__ASSERTMACROS__) ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin") diff --git a/dep/src/CMakeLists.txt b/dep/src/CMakeLists.txt index 62d3db7ce3d..a2b27016ce1 100644 --- a/dep/src/CMakeLists.txt +++ b/dep/src/CMakeLists.txt @@ -1,5 +1,7 @@ add_subdirectory(g3dlite) +if (NOT MACOSX) add_subdirectory(jmalloc) +endif(NOT MACOSX) add_subdirectory(sockets) add_subdirectory(zlib)