Corrections to the build system.

- FreeBSD does not support ACE_Stack_Trace
    - Made internal ACE build symmetrical with its external counterpart
    - Removed a redundant compiler directive
This commit is contained in:
H0zen 2015-12-07 18:49:36 +02:00
parent e2be5d0b82
commit 4292aeabb9
3 changed files with 4 additions and 8 deletions

View File

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

View File

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

View File

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