CMake - fix check for leveldb

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8f9c15f7bac6c0a7d40056b561928c844a5d652..a7837a9b423a10be6c090d29643035d30422783a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ CHECK_INCLUDE_FILES("dirent.h" HAVE_DIRENT_H)
 CHECK_INCLUDE_FILES("dlfcn.h" HAVE_DLFCN_H)
 CHECK_INCLUDE_FILES("inttypes.h" HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILES("linux/types.h" HAVE_LINUX_TYPES_H)
-CHECK_INCLUDE_FILES("leveldb/filter_policy.h" HAVE_LEVELDB_FILTER_POLICY)
 CHECK_INCLUDE_FILES("memory.h" HAVE_MEMORY_H)
 CHECK_INCLUDE_FILES("ndir.h" HAVE_NDIR_H)
 CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)
@@ -133,7 +132,7 @@ option(WITH_LEVELDB "LevelDB is here" ON)
 if(${WITH_LEVELDB})
 find_package(leveldb REQUIRED)
 set(HAVE_LIBLEVELDB ${LEVELDB_FOUND})
-CHECK_INCLUDE_FILES("leveldb/filter_policy.h" HAVE_LEVELDB_FILTER_POLICY)
+find_file(HAVE_LEVELDB_FILTER_POLICY filter_policy.h PATHS /usr/include/leveldb)
 endif(${WITH_LEVELDB})
 
 option(WITH_EXPAT "EXPAT is here" ON)

diff --git a/cmake/modules/Findleveldb.cmake b/cmake/modules/Findleveldb.cmake
index 8a3130241efe9820b5ae5a1b32f459c53957b186..dabe63a560676b4726fd5962f5ed3548f1cf3769 100644 (file)
--- a/cmake/modules/Findleveldb.cmake
+++ b/cmake/modules/Findleveldb.cmake
@@ -35,3 +35,8 @@ if (LEVELDB_INCLUDE AND LEVELDB_LIBS)
      message(STATUS "${LEVELDB_DIR_MESSAGE}")
    endif ()
  endif ()
+
+# handle the QUIETLY and REQUIRED arguments and set GPERFTOOLS_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(leveldb DEFAULT_MSG LEVELDB_LIBS LEVELDB_INCLUDE)

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 53d0f2ec050f602547193981f59270f967563fbf..8486d4cd3cd95ebb29448991963b8d677d058f61 100644 (file)
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -72,9 +72,6 @@
 /* Define if you have fuse */
 #cmakedefine HAVE_LIBFUSE
 
-/* Define to 1 if you have the `leveldb' library (-lleveldb). */
-#cmakedefine HAVE_LIBLEVELDB 1
-
 /* Define to 1 if you have the `profiler' library (-lprofiler). */
 #cmakedefine HAVE_LIBPROFILER 1