From 63d50348c6b9bbf5728dbcc093dde813de57a197 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 18 Apr 2021 21:38:23 +0800 Subject: [PATCH] cmake: let WITH_MGR_ROOK_CLIENT depend on WITH_MGR it does not depend on WITH_MGR_DASHBOARD_FRONTEND, which is disabled by default and is used for enable/disable the inclusion of dashboard support. while root client is used by orchestrator. so it should depend on WITH_MGR not WITH_MGR_DASHBOARD_FRONTEND. this change addresses the regression introduced by 1003f1ffeee0d016e353f2c8c4ba692b5fdc2805 Signed-off-by: Kefu Chai --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c0b6c87253e..ac8fee04d1d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -652,8 +652,8 @@ endif() set(DASHBOARD_FRONTEND_LANGS "" CACHE STRING "List of comma separated ceph-dashboard frontend languages to build. \ Use value `ALL` to build all languages") -CMAKE_DEPENDENT_OPTION(WITH_MGR_ROOK_CLIENT "Enable Rook support in the dashboard" ON - "WITH_MGR_DASHBOARD_FRONTEND" OFF) +CMAKE_DEPENDENT_OPTION(WITH_MGR_ROOK_CLIENT "Enable the mgr's Rook support" ON + "WITH_MGR" OFF) include_directories(SYSTEM ${PROJECT_BINARY_DIR}/include) -- 2.47.3