From 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 Mon Sep 17 00:00:00 2001
From: Spp <spp@jorge.gr>
Date: Fri, 9 Nov 2012 13:13:45 +0100
Subject: Core/Build: Enable Clang PCH support and OS X specific features Core:
 Fix warnings here and there

---
 cmake/platform/osx/settings.cmake  | 8 +++++---
 cmake/platform/unix/settings.cmake | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'cmake/platform')

diff --git a/cmake/platform/osx/settings.cmake b/cmake/platform/osx/settings.cmake
index f623ecf8c27..3d232c5a1f0 100644
--- a/cmake/platform/osx/settings.cmake
+++ b/cmake/platform/osx/settings.cmake
@@ -1,6 +1,4 @@
 set(MACOSX 1)
-set(OSX_LIBS /usr/lib/libcrypto.dylib)
-add_definitions(-D__ASSERTMACROS__)
 
 # set default configuration directory
 if( NOT CONF_DIR )
@@ -28,4 +26,8 @@ add_custom_target(uninstall
 )
 message(STATUS "OSX: Created uninstall target")
 
-include(${CMAKE_SOURCE_DIR}/cmake/compiler/xcode/settings.cmake)
+if (CMAKE_COMPILER_IS_GNUCC)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
+endif()
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
index dd8b7c081f3..c79cfc4ed4f 100644
--- a/cmake/platform/unix/settings.cmake
+++ b/cmake/platform/unix/settings.cmake
@@ -2,6 +2,7 @@
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   if (NOT NOJEM)
     set(JEMALLOC_LIBRARY "jemalloc")
+    message(STATUS "UNIX: Using jemalloc")
   endif()
 endif()
 
-- 
cgit v1.2.3