diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-30 00:36:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-30 00:36:03 +0200 |
| commit | 676c7341d69bc93e95f147608635655fd91c79b9 (patch) | |
| tree | 934a1bae2a8c791aad0bde4fe4acd04ecc7e2bf4 /cmake/platform/unix/settings.cmake | |
| parent | 83066a200202d7a487d11389e73173c1db0c391e (diff) | |
| parent | 718fc5bfc94bdfa8c94a5ed646f31305ab2b08bd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
Diffstat (limited to 'cmake/platform/unix/settings.cmake')
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index a851c8acf7a..b0c0d260623 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -32,10 +32,13 @@ add_custom_target(uninstall ) message(STATUS "UNIX: Created uninstall target") +message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}") if(CMAKE_C_COMPILER MATCHES "gcc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "clang") include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) +else() +add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') endif() |