diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/FindPostgreSql.cmake | 20 | ||||
| -rw-r--r-- | src/shared/Errors.h | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15f2db0433f..7581a495d49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/cmake/FindPostgreSql.cmake b/cmake/FindPostgreSql.cmake index 74833e87fbf..3d06ad87f97 100644 --- a/cmake/FindPostgreSql.cmake +++ b/cmake/FindPostgreSql.cmake @@ -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) diff --git a/src/shared/Errors.h b/src/shared/Errors.h index 2b3e441dd82..bb17b94cbd0 100644 --- a/src/shared/Errors.h +++ b/src/shared/Errors.h @@ -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" |