mirror of
https://github.com/mangosone/server
synced 2026-08-18 22:26:15 -04:00
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:
parent
4c8e894969
commit
dfa293adff
3 changed files with 4 additions and 8 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#else
|
||||
# define MANGOS_ASSERT WPError // Error even if in release mode.
|
||||
#endif
|
||||
#define MANGOS_ASSERT WPError // Error even if in release mode.
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue