diff options
| author | Kefu Chai <kchai@redhat.com> | 2021-04-09 12:54:46 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2021-04-13 03:13:47 +0200 |
| commit | 5ddda38da4f3c8ab8ff9c1a501bcd54df558fb80 (patch) | |
| tree | 3253187b2f856ec931ff11298c84ea435bbefa3c /CMakeLists.txt | |
| parent | cmake: use the same name for macros and cmake variables (diff) | |
| download | ceph-5ddda38da4f3c8ab8ff9c1a501bcd54df558fb80.tar.xz ceph-5ddda38da4f3c8ab8ff9c1a501bcd54df558fb80.zip | |
common: extract options into yaml
extract the options in common/options.cc into separate .yaml.in
files, and preprocess them using CMake before translating them into .cc
files using a python script.
this change paves the road to render the options using sphinx, and
will allow us to further annotate the options to include more metadata.
also, a this YAML file can be consumed by applications like dashboard
and Sphinx to consume these metadata in a simpler way.
* use @variable-name@ for substituting the variables in .yaml.in file
* use cmake variable of `mgr_disabled_modules` instead of C macro
to define `mgr_disabled_modules` in global.yaml.in
* debian/control, ceph.spec.in, win32_deps_build.sh: add python3-yaml
as build dep
* add y2c.py (short for YAML to C++) to translate .yaml to .cc file
* common/options/*.yaml.in: extract and split options into .yaml.in
files, the subvars in it is then replaced with CMake variables,
and copied to the corresponding .yaml files
* include/config-h.in.cmake: remove MGR_DISABLED_MODULES, as it
is not a CMake variable.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f623c5e1b79..b42f82d7c98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -487,11 +487,6 @@ if(WITH_MGR) set(MGR_PYTHON_LIBRARIES ${Python3_LIBRARIES}) set(MGR_PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR}) set(MGR_PYTHON_VERSION_MINOR ${Python3_VERSION_MINOR}) - # https://tracker.ceph.com/issues/45147 - if(Python3_VERSION VERSION_GREATER_EQUAL 3.8) - set(MGR_DISABLED_MODULES "diskprediction_local") - message(STATUS "mgr module disabled for ${Python3_VERSION}: ${MGR_DISABLED_MODULES}") - endif() # Boost dependency check deferred to Boost section endif(WITH_MGR) endif(NOT WIN32) |