From: Kefu Chai <kchai@redhat.com>
Date: Fri, 18 Sep 2020 04:17:44 +0000 (+0800)
Subject: cmake: extract admin/CMakeLists.txt
X-Git-Tag: v16.1.0~1047^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=709c73ef4af96770b08822677135160915d668df;p=ceph.git

cmake: extract admin/CMakeLists.txt

for better modularity

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

diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
index d346e942f086..f714aa9fbade 100644
--- a/src/crimson/CMakeLists.txt
+++ b/src/crimson/CMakeLists.txt
@@ -12,9 +12,6 @@ set_target_properties(crimson::cflags PROPERTIES
   INTERFACE_LINK_LIBRARIES Seastar::seastar)
 
 set(crimson_common_srcs
-  admin/admin_socket.cc
-  admin/osd_admin.cc
-  admin/pg_commands.cc
   common/assert.cc
   common/buffer_io.cc
   common/config_proxy.cc
@@ -184,5 +181,6 @@ target_link_libraries(crimson
   PUBLIC
     crimson-common
     crimson::cflags)
+add_subdirectory(admin)
 add_subdirectory(os)
 add_subdirectory(osd)
diff --git a/src/crimson/admin/CMakeLists.txt b/src/crimson/admin/CMakeLists.txt
new file mode 100644
index 000000000000..e92525e7084a
--- /dev/null
+++ b/src/crimson/admin/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(crimson-admin STATIC
+  admin_socket.cc
+  osd_admin.cc
+  pg_commands.cc)
+
+target_link_libraries(crimson-admin
+  crimson::cflags)
diff --git a/src/crimson/osd/CMakeLists.txt b/src/crimson/osd/CMakeLists.txt
index 1ee6e4f38ff1..2d0332848364 100644
--- a/src/crimson/osd/CMakeLists.txt
+++ b/src/crimson/osd/CMakeLists.txt
@@ -42,6 +42,7 @@ add_executable(crimson-osd
   watch.cc
   )
 target_link_libraries(crimson-osd
+  crimson-admin
   crimson-common
   crimson-os
   crimson