diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
| commit | c51380690ffeb82c1c75d3981c424612c0f2bc9f (patch) | |
| tree | 9b2b90379ceac9d6c0bdb97a744d10a49959a445 /cmake/platform | |
| parent | ccf593c6738ad1073381f1c2d404664e8d4ea187 (diff) | |
| parent | 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Server/WorldSession.h
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/osx/settings.cmake | 8 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 1 |
2 files changed, 6 insertions, 3 deletions
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() |