From cd0e606efe969d8361fd38b4ca959183feeddc9b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 4 Sep 2009 13:47:12 +0200 Subject: Don't use GNU readline --- CMakeLists.txt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 70ef036..d0d1ebb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,19 +3,14 @@ project(MAD) set(CMAKE_MODULE_PATH ${MAD_SOURCE_DIR}) +find_package(Boost REQUIRED date_time filesystem regex signals system thread) +find_package(Editline REQUIRED) find_package(LibXml2 REQUIRED) find_package(Mhash REQUIRED) find_package(OpenSSL REQUIRED) -find_package(Boost REQUIRED date_time filesystem regex signals system thread) -find_package(MySQL) -find_package(KRB5 COMPONENTS krb5 kadm-client) -find_package(Editline) -if(NOT EDITLINE_FOUND) - find_package(Readline REQUIRED) - set(EDITLINE_LIBRARY ${READLINE_LIBRARY}) - set(EDITLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR}) -endif(NOT EDITLINE_FOUND) +find_package(KRB5 COMPONENTS krb5 kadm-client) +find_package(MySQL) if(WIN32) add_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501) @@ -37,12 +32,12 @@ configure_file(${MAD_SOURCE_DIR}/config.h.in ${MAD_BINARY_DIR}/config.h) set(INCLUDES ${MAD_SOURCE_DIR}/src ${MAD_BINARY_DIR} - ${LIBXML2_INCLUDE_DIR} - ${MHASH_INCLUDE_DIR} + ${Boost_INCLUDE_DIR} ${DL_INCLUDE_DIR} ${EDITLINE_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${MHASH_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} ) add_subdirectory(src) -- cgit v1.2.3