From: Daniel Gryniewicz Date: Mon, 21 Sep 2015 16:29:51 +0000 (-0400) Subject: CMake - add check for libedit X-Git-Tag: v9.1.0~84^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a866a8947df85ef3603c09c746e56a095bc8302b;p=ceph.git CMake - add check for libedit Signed-off-by: Daniel Gryniewicz --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a169f0c3513b1..f9353a48ceeda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,6 @@ CHECK_INCLUDE_FILES("utime.h" HAVE_UTIME_H) CHECK_INCLUDE_FILES("${CMAKE_SOURCE_DIR}/src/include/fiemap.h" HAVE_FIEMAP_H) CHECK_INCLUDE_FILES("fuse/fuse_lowlevel.h" HAVE_FUSE_LOWLEVEL_H) CHECK_INCLUDE_FILES("fuse/fuse.h" HAVE_FUSE_H) -CHECK_INCLUDE_FILES("libedit/vis.h" HAVE_LIBEDIT_VIS_H) CHECK_INCLUDE_FILES("fcgi_config.h" HAVE_FASTCGI_CONFIG_H) CHECK_INCLUDE_FILES("fastcgi.h" HAVE_FASTCGI_H) CHECK_INCLUDE_FILES("fcgiapp.h" FASTCGI_FASTCGI_APP_DIR) @@ -176,6 +175,8 @@ find_package(libuuid REQUIRED) find_package(libcurl REQUIRED) +find_package(libedit REQUIRED) + option(USE_CRYPTOPP "Cryptopp is ON" ON) find_package(cryptopp) if(CRYPTOPP_FOUND) diff --git a/cmake/modules/Findlibedit.cmake b/cmake/modules/Findlibedit.cmake new file mode 100644 index 0000000000000..0fab5699dbc1f --- /dev/null +++ b/cmake/modules/Findlibedit.cmake @@ -0,0 +1,32 @@ +# Try to find libedit +# Once done, this will define +# +# LIBEDIT_FOUND - system has Profiler +# LIBEDIT_INCLUDE_DIR - the Profiler include directories +# LIBEDIT_LIBRARIES - link these to use Profiler + +if(LIBEDIT_INCLUDE_DIR AND LIBEDIT_LIBRARIES) + set(LIBEDIT_FIND_QUIETLY TRUE) +endif(LIBEDIT_INCLUDE_DIR AND LIBEDIT_LIBRARIES) + +INCLUDE(CheckCXXSymbolExists) + +# include dir + +find_path(LIBEDIT_INCLUDE_DIR histedit.h NO_DEFAULT_PATH PATHS + /usr/include + /opt/local/include + /usr/local/include +) + + +# finally the library itself +find_library(LIBLIBEDIT NAMES edit) +set(LIBEDIT_LIBRARIES ${LIBLIBEDIT}) + +# handle the QUIETLY and REQUIRED arguments and set LIBEDIT_FOUND to TRUE if +# all listed variables are TRUE +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(libedit DEFAULT_MSG LIBEDIT_LIBRARIES LIBEDIT_INCLUDE_DIR) + +mark_as_advanced(LIBEDIT_LIBRARIES LIBEDIT_INCLUDE_DIR)