From: Daniel Gryniewicz Date: Mon, 21 Sep 2015 15:42:53 +0000 (-0400) Subject: CMake - fix check for fcgi X-Git-Tag: v9.1.0~84^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6c8b46101227bde8ac5f2c26b18f8058f06a117;p=ceph.git CMake - fix check for fcgi Signed-off-by: Daniel Gryniewicz --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c5ac0deab71..6980f7e8bbdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,11 +141,7 @@ find_package(expat REQUIRED) set(HAVE_EXPAT ${EXPAT_FOUND}) endif(${WITH_EXPAT}) -option(WITH_FCGI "FCGI is here" ON) -if(${WITH_FCGI}) find_package(fcgi REQUIRED) -set(HAVE_FCGI ${FCGI_FOUND}) -endif(${WITH_FCGI}) find_package(atomic_ops REQUIRED) set(HAVE_ATOMIC_OPS ${ATOMIC_OPS_FOUND}) diff --git a/cmake/modules/Findfcgi.cmake b/cmake/modules/Findfcgi.cmake index 0d07dce9374f..b5f366b21bcd 100644 --- a/cmake/modules/Findfcgi.cmake +++ b/cmake/modules/Findfcgi.cmake @@ -33,3 +33,10 @@ ELSE (FCGI_FOUND) MESSAGE(FATAL_ERROR "Could not find FCGI") ENDIF (FCGI_FIND_REQUIRED) ENDIF (FCGI_FOUND) + +# 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(fcgi DEFAULT_MSG FCGI_LIBRARY FCGI_INCLUDE_DIR) + +mark_as_advanced(UUID_LIBRARIES UUID_INCLUDE_DIR)