From: Mike Christie <mchristi@redhat.com>
Date: Tue, 4 Jun 2019 18:32:09 +0000 (-0500)
Subject: cmake: Move WITH_RBD option earlier
X-Git-Tag: v14.2.5~167^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2dc404c4fa1b950d3bc0aa6433ab5120ab1ea78;p=ceph.git

cmake: Move WITH_RBD option earlier

The next patch will add a WITH_RBD check to the LINUX check block so we
only check for the netlink libs when those 2 conditions are met, so this
moves the WIT_RBD option setup to before the LINUX check.

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 3fe16add7da298e5e2814cfe67e7baee600a528f)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e187f261bc4..4c652018dff2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,6 +210,9 @@ endif()
 
 find_package(Backtrace)
 
+# remote block storage
+option(WITH_RBD "Remote block storage is here" ON)
+
 if(LINUX)
   find_package(udev REQUIRED)
   set(HAVE_UDEV ${UDEV_FOUND})
@@ -311,9 +314,6 @@ option(WITH_LIBCEPHFS "libcephfs client library" ON)
 # key-value store
 option(WITH_KVS "Key value store is here" ON)
 
-# remote block storage
-option(WITH_RBD "Remote block storage is here" ON)
-
 # KERNEL remote block storage
 option(WITH_KRBD "Kernel Remote block storage is here" ON)