diff options
| -rw-r--r-- | CMakeLists.txt | 24 | ||||
| -rw-r--r-- | cmake/FindReadline.cmake | 3 |
2 files changed, 11 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f34e5a9ece..8e553cf9676 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,12 +128,16 @@ else(SHORT_SLEEP) message("* System sleep time is 100ms") endif(SHORT_SLEEP) -IF(CENTOS) -add_definitions(-DCENTOS) - message("* Building with termcap") -else(CENTOS) - message("* Building with readline") -ENDIF(CENTOS) +IF(UNIX) + IF(CENTOS) + add_definitions(-DCENTOS) + MESSAGE("* Building with termcap") + FIND_TERMCAP() + ELSE(CENTOS) + MESSAGE("* Building with readline") + FIND_READLINE() + ENDIF(CENTOS) +ENDIF(UNIX) FIND_ACE(ACE) if(ACE_FOUND) @@ -160,14 +164,6 @@ ELSE(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h) message(STATUS "** Your libace is out of date. Please update your libace!") ENDIF(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h) -IF(UNIX) - IF(CENTOS) - FIND_TERMCAP() - ELSE(CENTOS) - FIND_READLINE() - ENDIF(CENTOS) -ENDIF(UNIX) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake index c81d1556bd2..993ac5126c2 100644 --- a/cmake/FindReadline.cmake +++ b/cmake/FindReadline.cmake @@ -16,8 +16,7 @@ IF (READLINE_INCLUDE_DIR AND READLINE_LIBRARY) INCLUDE_DIRECTORIES(${READLINE_INCLUDE_DIR}) ELSE (READLINE_INCLUDE_DIR AND READLINE_LIBRARY) SET(READLINE_FOUND FALSE) - MESSAGE(FATAL_ERROR "** Readline library not found!") - MESSAGE(FATAL_ERROR "** Your distro may provide a binary for Readline e.g. for ubuntu try apt-get install libreadline5-dev") + MESSAGE(FATAL_ERROR "** Readline library not found!\n** Your distro may provide a binary for Readline e.g. for ubuntu try apt-get install libreadline5-dev") ENDIF (READLINE_INCLUDE_DIR AND READLINE_LIBRARY) ENDMACRO(FIND_READLINE) |