From: Kefu Chai <kchai@redhat.com>
Date: Thu, 12 Mar 2020 04:05:11 +0000 (+0800)
Subject: cmake: lift if(WITH_MGR_ROOK_CLIENT) to upper directory
X-Git-Tag: v16.0.0~36^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ba9948681e1e03691d76e94d7d540bc3c003caf;p=ceph.git

cmake: lift if(WITH_MGR_ROOK_CLIENT) to upper directory

simpler this way

and drop the comment, which is not relevant.

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

diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt
index f7bf96701fe0..8c544eb41800 100644
--- a/src/pybind/mgr/CMakeLists.txt
+++ b/src/pybind/mgr/CMakeLists.txt
@@ -2,8 +2,9 @@ if(WITH_MGR_DASHBOARD_FRONTEND)
   add_subdirectory(dashboard)
 endif()
 add_subdirectory(insights)
-add_subdirectory(rook)
-
+if(WITH_MGR_ROOK_CLIENT)
+  add_subdirectory(rook)
+endif()
 if(WITH_TESTS)
   include(AddCephTest)
   add_tox_test(mgr ${CMAKE_CURRENT_SOURCE_DIR} TOX_ENVS mypy)
diff --git a/src/pybind/mgr/rook/CMakeLists.txt b/src/pybind/mgr/rook/CMakeLists.txt
index a1a6aeeb0108..0ef7081d90c2 100644
--- a/src/pybind/mgr/rook/CMakeLists.txt
+++ b/src/pybind/mgr/rook/CMakeLists.txt
@@ -1,6 +1,3 @@
-# if(WITH_MGR_DASHBOARD_FRONTEND AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
-
-if (WITH_MGR_ROOK_CLIENT)
 add_custom_command(
   OUTPUT rook_client/__init__.py
   COMMAND ./generate_rook_ceph_client.sh
@@ -15,4 +12,3 @@ add_custom_target(mgr-rook-client
 )
 
 add_dependencies(ceph-mgr mgr-rook-client)
-endif (WITH_MGR_ROOK_CLIENT)
\ No newline at end of file