Fix build on windows and propably on centos

--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-07-25 14:36:42 +02:00
parent 6998d0185c
commit e1c2d50796
3 changed files with 14 additions and 12 deletions

View File

@@ -150,7 +150,7 @@ return()
#message(STATUS "And link using: ${ACE_LIBRARY}")
endif(ACE_FOUND)
IF(UNIX)
IF(UNIX AND NOT CENTOS)
FIND_READLINE()
IF(READLINE_FOUND)
message(STATUS "Found Readline library: ${READLINE_LIBRARY}")
@@ -160,7 +160,7 @@ IF(UNIX)
message(SEND_ERROR "** Your distro may provide a binary for Readline e.g. for ubuntu try apt-get install libreadline5-dev")
return()
ENDIF(READLINE_FOUND)
ENDIF(UNIX)
ENDIF(UNIX AND NOT CENTOS)
check_include_files(ace/Stack_Trace.h HAVE_ACE_STACK_TRACE_H)
IF(NOT HAVE_ACE_STACK_TRACE_H)

View File

@@ -30,16 +30,16 @@ MACRO(FIND_PostgreSQL)
)
find_library(POSTGRESQL_LIBRARIES NAMES pq libpq
PATHS
/usr/lib
/usr/local/lib
/usr/lib/postgresql
/usr/lib64
/usr/local/lib64
/usr/lib64/postgresql
$ENV{ProgramFiles}/PostgreSQL/*/lib/ms
$ENV{SystemDrive}/PostgreSQL/*/lib/ms
)
PATHS
/usr/lib
/usr/local/lib
/usr/lib/postgresql
/usr/lib64
/usr/local/lib64
/usr/lib64/postgresql
$ENV{ProgramFiles}/PostgreSQL/*/lib/ms
$ENV{SystemDrive}/PostgreSQL/*/lib/ms
)
if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
set(POSTGRESQL_FOUND TRUE)

View File

@@ -23,9 +23,11 @@
#include "Common.h"
#if PLATFORM != PLATFORM_WINDOWS
#ifndef HAVE_CONFIG_H
#include <config.h>
#endif
#endif
#ifdef HAVE_ACE_STACK_TRACE_H
#include "ace/Stack_Trace.h"