Fix build with old ACE lib
But anyway, you should update your ACE lib --HG-- branch : trunk
This commit is contained in:
+5
-2
@@ -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}
|
||||
|
||||
+6
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user