From: Kefu Chai <kchai@redhat.com>
Date: Fri, 23 Apr 2021 11:17:30 +0000 (+0800)
Subject: cmake: Revert "cmake: use file(GLOB ..) to find .yaml.in files"
X-Git-Tag: v17.1.0~1968^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6dbc21cf80dfa595e8cf2e296173bd83fc5f4bb;p=ceph.git

cmake: Revert "cmake: use file(GLOB ..) to find .yaml.in files"

This reverts commit 4e58b5899e98397ea928cbde1451b0734fa0892b.

the list of .yaml.in file might change over time before we finish the
.yaml.in file split, but cmake would fail to figure out the list without
rerunning "cmake", so when a new .yaml.in file is introduced, developer
might end up with a FTBFS after pulling the change from remote repo.

so, we need to revert the file(GLOB ..) change, until all .yaml.in file
are created.

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

diff --git a/src/common/options/CMakeLists.txt b/src/common/options/CMakeLists.txt
index 8b934a6df2dc..6424271e3812 100644
--- a/src/common/options/CMakeLists.txt
+++ b/src/common/options/CMakeLists.txt
@@ -21,7 +21,8 @@ function(file_configure input_file output_file)
     VERBATIM)
 endfunction()
 
-function(add_options name yaml_in_file)
+function(add_options name)
+  set(yaml_in_file ${CMAKE_CURRENT_SOURCE_DIR}/${name}.yaml.in)
   set(yaml_file ${CMAKE_CURRENT_BINARY_DIR}/${name}.yaml)
   file_configure("${yaml_in_file}"
     "${yaml_file}" @ONLY)
@@ -78,17 +79,21 @@ if(WITH_MGR)
   endif()
 endif()
 
+add_options(global)
+add_options(cephfs-mirror)
+add_options(crimson)
+add_options(mds)
+add_options(mds-client)
+add_options(rbd)
+add_options(rbd-mirror)
+add_options(immutable-object-cache)
+
 # if set to empty string, system default luarocks package location (if exist) will be used
 set(rgw_luarocks_location "")
 if(WITH_RADOSGW_LUA_PACKAGES)
   set(rgw_luarocks_location "/tmp/luarocks")
 endif()
-
-file(GLOB yaml_in_srcs "*.yaml.in")
-foreach(fn ${yaml_in_srcs})
-  get_filename_component(name ${fn} NAME_WE)
-  add_options(${name} ${fn})
-endforeach()
+add_options(rgw)
 
 add_library(common-options-objs OBJECT
   ${common_options_srcs})