diff options
| author | Anubisss <none@none> | 2009-07-25 02:51:17 +0200 |
|---|---|---|
| committer | Anubisss <none@none> | 2009-07-25 02:51:17 +0200 |
| commit | d26389c9d43d6f75f5152eb437f5c7e66c29a9b9 (patch) | |
| tree | 0d623c25a202977d3f2b4fe57fc87fa4f057d5dd | |
| parent | 2cad0f09d4cf4e9e7fd5a2c0ac45fd423e4e2f0e (diff) | |
| parent | 6998d0185c22e94ad0d407821842dbb979472b40 (diff) | |
*Merge with 4584. :(
--HG--
branch : trunk
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | config.h.cmake | 7 | ||||
| -rw-r--r-- | src/shared/Errors.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ec222cc3c48..15f2db0433f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,11 +162,13 @@ IF(UNIX) ENDIF(READLINE_FOUND) ENDIF(UNIX) -check_include_files(ace/Stack_Trace.h HAVE_STACK_TRACE_H) +check_include_files(ace/Stack_Trace.h HAVE_ACE_STACK_TRACE_H) +IF(NOT HAVE_ACE_STACK_TRACE_H) + message(STATUS "** Your libace is old. Please update your libace!") +ENDIF(NOT HAVE_ACE_STACK_TRACE_H) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) - IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET(OSX_LIBS -lcrypto) add_definitions(-D__ASSERTMACROS__) @@ -184,6 +186,7 @@ src/framework src/shared/Database src/shared/vmap src/game +${CMAKE_BINARY_DIR} ${SCRIPT_INCLUDE} ${MYSQL_INCLUDE_DIR} ${POSTGRESQL_INCLUDE_DIR} diff --git a/config.h.cmake b/config.h.cmake index 0b52561a702..2442e1779c0 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1 +1,6 @@ -#cmakedefine HAVE_STACK_TRACE_H 1 +#ifndef HAVE_CONFIG_H +#define HAVE_CONFIG_H + +#cmakedefine HAVE_ACE_STACK_TRACE_H + +#endif HAVE_CONFIG_H diff --git a/src/shared/Errors.h b/src/shared/Errors.h index 5cfd109ee01..2b3e441dd82 100644 --- a/src/shared/Errors.h +++ b/src/shared/Errors.h @@ -24,7 +24,7 @@ #include "Common.h" #ifndef HAVE_CONFIG_H -#define HAVE_ACE_STACK_TRACE_H 1 +#include <config.h> #endif #ifdef HAVE_ACE_STACK_TRACE_H |