CMake - fix check for fcgi

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c5ac0deab716d36a33ffb06560fedd266cc59e3..6980f7e8bbdf7df640bb9eb631307945b0136756 100644 (file)
--- 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 0d07dce9374f666fc5c0321e4c398819768379d1..b5f366b21bcd853fa7e46655660bec543db12308 100644 (file)
--- 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)