commit 27a52c212366bd3f9cd72f651a365e05733f61e3
author Anton Komlev <anton.komlev@arm.com> Sat Oct 16 02:04:09 2021 +0100
committer Anton Komlev <Anton.Komlev@arm.com> Tue Oct 19 13:13:22 2021 +0200
tree c78bc9326cc30450c2fe7e7f68012b837e0cdd59
parent 6559716939569f9c94b237fa18142af48be329fe

docs: Upgrade documentation tools

Signed-off-by: Anton Komlev <anton.komlev@arm.com>
Change-Id: Iaa12abed9f34017025e17c1bfc7df8f45c12ac13

docs/CMakeLists.txt

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index b17780a..c6caa21 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 # suppress warnings on mismatched names in PythonModules
 set(FPHSA_NAME_MISMATCHED True)
-find_package(PythonModules COMPONENTS m2r sphinx-rtd-theme sphinxcontrib.plantuml)
+find_package(PythonModules COMPONENTS m2r2 sphinx-rtd-theme sphinxcontrib.plantuml)
 find_package(PlantUML)
 find_package(Doxygen 1.8.0)
 find_package(LATEX COMPONENTS PDFLATEX)
@@ -52,7 +52,7 @@
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tfm_env.py.in ${SPHINX_TMP_DOC_DIR}/tfm_env.py @ONLY)
 
-if (SPHINX_FOUND AND PLANTUML_FOUND AND PY_M2R_FOUND AND PY_SPHINX-RTD-THEME_FOUND AND PY_SPHINXCONTRIB.PLANTUML)
+if (SPHINX_FOUND AND PLANTUML_FOUND AND PY_M2R2_FOUND AND PY_SPHINX-RTD-THEME_FOUND AND PY_SPHINXCONTRIB.PLANTUML)
 
     file(GLOB_RECURSE SPHINXCFG_DOC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.rst)