]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
CMake: libblkid not only needed with rbd
authorJohn Spray <john.spray@redhat.com>
Mon, 3 Aug 2015 11:59:00 +0000 (12:59 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 3 Aug 2015 15:39:35 +0000 (16:39 +0100)
It's linked in libcommon.

Signed-off-by: John Spray <john.spray@redhat.com>
CMakeLists.txt

index 5a54aa6498235395c5d6be4203c332f35140064b..c28362d55bfb334fd089acc26b750e0b033a4ce7 100644 (file)
@@ -117,6 +117,9 @@ set(HAVE_LIBFUSE ${FUSE_FOUND})
 CHECK_FUNCTION_EXISTS(fuse_getgroups HAVE_FUSE_GETGROUPS)
 endif(${WITH_FUSE})
 
+find_package(blkid REQUIRED)
+set(HAVE_LIBBLKID ${BLKID_FOUND})
+
 # probably fuse etc need this -- how to check? XXX
 option(WITH_MDS "MDS is here" ON)
 
@@ -129,10 +132,6 @@ option(WITH_KVS "Key value store is here" ON)
 
 # remote block storage
 option(WITH_RBD "Remote block storage is here" ON)
-if(${WITH_RBD})
-find_package(blkid REQUIRED)
-set(HAVE_LIBBLKID ${BLKID_FOUND})
-endif(${WITH_RBD})
 
 option(WITH_LEVELDB "LevelDB is here" ON)
 if(${WITH_LEVELDB})