3 files changed, 27 insertions, 13 deletions
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
index a3a3240deb8..e98be5011ff 100644
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@@ -1,3 +1,11 @@
+# build in Release-mode by default if not explicitly set
+if( NOT CMAKE_BUILD_TYPE )
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+# Set build-directive (used in core to tell which buildtype we used)
+add_definitions(-D_BUILD_DIRECTIVE=${CMAKE_BUILD_TYPE})
+
 add_definitions(-fno-delete-null-pointer-checks)
 
 if( USE_SFMT)
@@ -6,18 +14,18 @@ if( USE_SFMT)
     add_definitions(-msse2 -mfpmath=sse)
   endif()
   add_definitions(-DHAVE_SSE2 -D__SSE2__)
-  message(STATUS "- GCC: SFMT enabled, SSE2 flags forced")
+  message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
 endif()
 
 if( WITH_WARNINGS )
   add_definitions(-Wall -Wfatal-errors -Wextra)
-  message(STATUS "- GCC: All warnings enabled")
+  message(STATUS "GCC: All warnings enabled")
 else()
   add_definitions(--no-warnings)
-  message(STATUS "- GCC: All warnings disabled")
+  message(STATUS "GCC: All warnings disabled")
 endif()
 
 if( WITH_COREDEBUG )
   add_definitions(-ggdb3)
-  message(STATUS "- GCC: Debug-flags set (-ggdb3)")
+  message(STATUS "GCC: Debug-flags set (-ggdb3)")
 endif()
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
index 89841d87a7b..fd96ea016e1 100644
--- a/cmake/compiler/msvc/settings.cmake
+++ b/cmake/compiler/msvc/settings.cmake
@@ -10,46 +10,49 @@ if(PLATFORM EQUAL 64)
   # here: http://tinyurl.com/2cb428.  Syntax highlighting is important for proper
   # debugger functionality.
   add_definitions("-D_WIN64")
-  message(STATUS "- MSVC: 64-bit platform, enforced -D_WIN64 parameter")
+  message(STATUS "MSVC: 64-bit platform, enforced -D_WIN64 parameter")
 
   #Enable extended object support for debug compiles on X64 (not required on X86)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
-  message(STATUS "- MSVC: Enabled extended object-support for debug-compiles")
+  message(STATUS "MSVC: Enabled extended object-support for debug-compiles")
 else()
   # mark 32 bit executables large address aware so they can use > 2GB address space
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
-  message(STATUS "- MSVC: Enabled large address awareness")
+  message(STATUS "MSVC: Enabled large address awareness")
 
   # Test if we need SSE2-support
   if(USE_SFMT)
     add_definitions(/arch:SSE2)
-    message(STATUS "- MSVC: Enabled SSE2 support")
+    message(STATUS "MSVC: Enabled SSE2 support")
   endif()
 endif()
 
+# Set build-directive (used in core to tell which buildtype we used)
+add_definitions(-D_BUILD_DIRECTIVE="$(ConfigurationName)")
+
 # multithreaded compiling on VS
 if((NOT USE_COREPCH) AND (NOT USE_SCRIPTPCH))
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-  message(STATUS "- MSVC: PCH not used - enabled multithreaded compiling")
+  message(STATUS "MSVC: PCH not used - enabled multithreaded compiling")
 endif()
 
 # Define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES - eliminates the warning by changing the strcpy call to strcpy_s, which prevents buffer overruns
 add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
-message(STATUS "- MSVC: Overloaded standard names")
+message(STATUS "MSVC: Overloaded standard names")
 
 # Ignore warnings about older, less secure functions
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-message(STATUS "- MSVC: Disabled NON-SECURE warnings")
+message(STATUS "MSVC: Disabled NON-SECURE warnings")
 
 #Ignore warnings about POSIX deprecation
 add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
-message(STATUS "- MSVC: Disabled POSIX warnings")
+message(STATUS "MSVC: Disabled POSIX warnings")
 
 # disable warnings in Visual Studio 8 and above if not wanted
 if(NOT WITH_WARNINGS)
   if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619")
-    message(STATUS "- MSVC: Disabled generic compiletime warnings")
+    message(STATUS "MSVC: Disabled generic compiletime warnings")
   endif()
 endif()
diff --git a/cmake/compiler/xcode/settings.cmake b/cmake/compiler/xcode/settings.cmake
new file mode 100644
index 00000000000..5a01cee61ec
--- /dev/null
+++ b/cmake/compiler/xcode/settings.cmake
@@ -0,0 +1,3 @@
+# Set build-directive (used in core to tell which buildtype we used)
+add_definitions(-D_BUILD_DIRECTIVE="\"$(CONFIGURATION)"\")
+