Merge pull request #58 from H0zen/develop21

[Build] Corrections to the build system.

CMakeLists.txt

@@ -105,6 +105,9 @@ if(ACE_USE_EXTERNAL)
     endif()
 else()
     include(cmake/ImportACE.cmake)
+    if(NOT(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD"))
+        add_definitions(-DHAVE_ACE_STACK_TRACE_H)
+    endif()
 endif()
 
 if(POSTGRESQL)

cmake/ImportACE.cmake

@@ -37,8 +37,6 @@ link_directories(
   ${ACE_LIBRARIES_DIR}
 )
 
-set(HAVE_ACE_STACK_TRACE_H ON) # config.h.cmake
-
 #if(WIN32)
 #  foreach(DIR ${ACE_LIBRARIES_DIR})
 #    install(

src/shared/Utilities/Errors.h

@@ -27,7 +27,6 @@
 
 #include "Common/Common.h"
 
-#define HAVE_ACE_STACK_TRACE_H 1
 
 #ifdef HAVE_ACE_STACK_TRACE_H
 #  include <ace/Stack_Trace.h>
@@ -71,10 +70,6 @@
     }
 #endif
 
-#ifdef MANGOS_DEBUG
+#define MANGOS_ASSERT WPError                             // Error even if in release mode.
-#  define MANGOS_ASSERT WPError
-#else
-#  define MANGOS_ASSERT WPError                             // Error even if in release mode.
-#endif
 
 #endif