From: Kefu Chai <kchai@redhat.com>
Date: Sat, 3 Apr 2021 13:53:17 +0000 (+0800)
Subject: cmake: find pmem once instead twice
X-Git-Tag: v17.1.0~2363^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6978584e991ceeb6bb258f26a9058b0ae4f3e621;p=ceph-ci.git

cmake: find pmem once instead twice

less noise in cmake output

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db460978dd5..98db46226bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -507,12 +507,14 @@ endif()
 
 if(WITH_BLUESTORE_PMEM OR WITH_RBD_RWL)
   if(WITH_SYSTEM_PMDK)
+    set(pmem_COMPONENTS)
     if(WITH_BLUESTORE_PMEM)
-      find_package(pmem 1.7 REQUIRED COMPONENTS pmem)
+      list(APPEND pmem_COMPONENTS pmem)
     endif()
     if(WITH_RBD_RWL)
-      find_package(pmem 1.7 REQUIRED COMPONENTS pmemobj)
+      list(APPEND pmem_COMPONENTS pmemobj)
     endif()
+    find_package(pmem 1.7 REQUIRED COMPONENTS ${pmem_COMPONENTS})
   else()
     include(Buildpmem)
     build_pmem()