From d5b41b76474292df0c6f889ba7b6f54a19b9ec18 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 13 Oct 2016 17:35:27 +0200 Subject: [PATCH] cmake: check WITH_RADOSGW for fcgi and expat dependencies The fcgi and expat libraries are only used by rgw, so only make them hard requirements if WITH_RADOSGW is set. Signed-off-by: David Disseldorp --- CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03fdbbf40b422..107d0a39bfd4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,13 +240,6 @@ find_package(leveldb REQUIRED) find_file(HAVE_LEVELDB_FILTER_POLICY leveldb/filter_policy.h PATHS ${LEVELDB_INCLUDE_DIR}) endif(${WITH_LEVELDB}) -option(WITH_EXPAT "EXPAT is here" ON) -if(${WITH_EXPAT}) -find_package(EXPAT REQUIRED) -endif(${WITH_EXPAT}) - -find_package(fcgi REQUIRED) - find_package(atomic_ops REQUIRED) message(STATUS "${ATOMIC_OPS_LIBRARIES}") if(NOT ${ATOMIC_OPS_FOUND}) @@ -325,6 +318,10 @@ endif(WITH_XIO) #option for RGW option(WITH_RADOSGW "Rados Gateway is enabled" ON) +if(WITH_RADOSGW) + find_package(EXPAT REQUIRED) + find_package(fcgi REQUIRED) +endif(WITH_RADOSGW) #option for CephFS option(WITH_CEPHFS "CephFS is enabled" ON) -- 2.39.5