From 4d02f8746c141d0ec7b4946c74ca40867fd479e6 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Mon, 21 Sep 2015 12:25:05 -0400 Subject: [PATCH] CMake - fix check for Snappy Signed-off-by: Daniel Gryniewicz --- CMakeLists.txt | 5 ----- cmake/modules/Findsnappy.cmake | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9b37fb59912..a169f0c3513b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,6 @@ CHECK_INCLUDE_FILES("fcgio.h" HAVE_FASTCGIO_H) CHECK_INCLUDE_FILES("fcgios.h" FASTCGI_FASTCGIOS_DIR) CHECK_INCLUDE_FILES("fcgi_stdio.h" HAVE_FASTCGI_STDIO_H) CHECK_INCLUDE_FILES("openssl/ssl.h" HAVE_SSL_H) -CHECK_INCLUDE_FILES("snappy.h" HAVE_SNAPPY_H) CHECK_INCLUDE_FILES("keyutils.h" HAVE_KEYUTILS_H) include(CheckSymbolExists) @@ -163,11 +162,7 @@ if(${WITH_GPERFTOOLS}) endif(${HAVE_GPERFTOOLS}) endif(${WITH_GPERFTOOLS}) -option(WITH_SNAPPY "Snappy is here" ON) -if(${WITH_SNAPPY}) find_package(snappy REQUIRED) -set(HAVE_LIBSNAPPY ${SNAPPY_FOUND}) -endif(${WITH_SNAPPY}) option(WITH_TCMALLOC "Use TCMalloc as Allocator" ON) if(${WITH_TCMALLOC}) diff --git a/cmake/modules/Findsnappy.cmake b/cmake/modules/Findsnappy.cmake index 0ce92a8172da..546775cbce6c 100644 --- a/cmake/modules/Findsnappy.cmake +++ b/cmake/modules/Findsnappy.cmake @@ -56,6 +56,11 @@ else () endif () endif () +# handle the QUIETLY and REQUIRED arguments and set UUID_FOUND to TRUE if +# all listed variables are TRUE +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(snappy DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR) + mark_as_advanced( SNAPPY_LIBRARY SNAPPY_I -- 2.47.3