From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 17 Oct 2023 16:59:41 +0000 (-0400)
Subject: cmake: promote uring package search to top-level
X-Git-Tag: v19.0.0~253^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3438de58f2af599901a19cf984e2e7cb1e9f6944;p=ceph-ci.git

cmake: promote uring package search to top-level

For use by multiple projects, rocksdb in particular.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34d035b4df8..28c9209c557 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,6 +256,15 @@ set(HAVE_LIBURING ${WITH_LIBURING})
 CMAKE_DEPENDENT_OPTION(WITH_SYSTEM_LIBURING "Require and build with system liburing" OFF
   "HAVE_LIBAIO;WITH_BLUESTORE" OFF)
 
+if(WITH_LIBURING)
+  if(WITH_SYSTEM_LIBURING)
+    find_package(uring REQUIRED)
+  else()
+    include(Builduring)
+    build_uring()
+  endif()
+endif()
+
 CMAKE_DEPENDENT_OPTION(WITH_BLUESTORE_PMEM "Enable PMDK libraries" OFF
   "WITH_BLUESTORE" OFF)
 if(WITH_BLUESTORE_PMEM)
diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt
index 288955dd054..5d9fd6a5295 100644
--- a/src/blk/CMakeLists.txt
+++ b/src/blk/CMakeLists.txt
@@ -57,11 +57,5 @@ if(WITH_EVENTTRACE)
 endif()
 
 if(WITH_LIBURING)
-  if(WITH_SYSTEM_LIBURING)
-    find_package(uring REQUIRED)
-  else()
-    include(Builduring)
-    build_uring()
-  endif()
   target_link_libraries(blk PRIVATE uring::uring)
 endif()