From f291c50f17dcf4f4657aadbf8b4a38df6fa98731 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 2 May 2020 15:22:13 +0200 Subject: Doc: fix/hacks for compatibility with Breathe 4.17.0 [skip appveyor] (#2204) --- Doxyfile | 4 +++- scripts/doxygen.sh | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Doxyfile b/Doxyfile index 1d016904..75701eef 100644 --- a/Doxyfile +++ b/Doxyfile @@ -2045,7 +2045,9 @@ PREDEFINED = DOXYGEN_ENABLED \ protected=private \ INLINED_MAKE_SHARED= \ PROJ_OPAQUE_PRIVATE_DATA= \ - PROJ_PRIVATE=private + PROJ_PRIVATE=private \ + PROJ_PURE_DECL= \ + noexceptoverride="noexcept override" # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The diff --git a/scripts/doxygen.sh b/scripts/doxygen.sh index 380afcfa..8087ceba 100755 --- a/scripts/doxygen.sh +++ b/scripts/doxygen.sh @@ -64,5 +64,12 @@ mv ${TOPDIR}/docs/build/xml/classosgeo_1_1proj_1_1io_1_1WKTFormatter.xml.tmp ${ sed "s/CONST_CHAR/const char/" < ${TOPDIR}/docs/build/xml/proj_8h.xml > ${TOPDIR}/docs/build/xml/proj_8h.xml.tmp mv ${TOPDIR}/docs/build/xml/proj_8h.xml.tmp ${TOPDIR}/docs/build/xml/proj_8h.xml +# Hack for Breathe 4.17.0 issue that is confused by osgeo::proj::common::UnitOfMeasure::Type::NONE (enumeration value of Type) and osgeo::proj::common::UnitOfMeasure::NONE (member value), whereas 4.16.0 works fine. +# Filed as https://github.com/michaeljones/breathe/issues/518 +sed "s/ NONE<\/name>/ Type::NONE<\/name>/" < ${TOPDIR}/docs/build/xml/classosgeo_1_1proj_1_1common_1_1UnitOfMeasure.xml > ${TOPDIR}/docs/build/xml/classosgeo_1_1proj_1_1common_1_1UnitOfMeasure.xml.tmp +mv ${TOPDIR}/docs/build/xml/classosgeo_1_1proj_1_1common_1_1UnitOfMeasure.xml.tmp ${TOPDIR}/docs/build/xml/classosgeo_1_1proj_1_1common_1_1UnitOfMeasure.xml +sed 's/refid="classosgeo_1_1proj_1_1common_1_1UnitOfMeasure_1a400c71b5a6d7927e3e5850cee2b07d10ab50339a10e1de285ac99d4c3990b8693" kind="enumvalue">NONE<\/name><\/member>/refid="classosgeo_1_1proj_1_1common_1_1UnitOfMeasure_1a400c71b5a6d7927e3e5850cee2b07d10ab50339a10e1de285ac99d4c3990b8693" kind="enumvalue">Type::NONE<\/name><\/member>/' < ${TOPDIR}/docs/build/xml/index.xml > ${TOPDIR}/docs/build/xml/index.xml.tmp +mv ${TOPDIR}/docs/build/xml/index.xml.tmp ${TOPDIR}/docs/build/xml/index.xml + popd > /dev/null || exit -- cgit v1.2.3