diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-05-02 16:19:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 16:19:03 +0200 |
| commit | 6d6cbf8b69bbecb6db4156f20c04ec515611d0a4 (patch) | |
| tree | 31d51d272d3524fd3a9686687bb8112bcc755b45 | |
| parent | 1f93923bb7c1741b1e66db234af42d164f3c3450 (diff) | |
| parent | d45c97d33e3880c62c12526e056465db75b6dcdd (diff) | |
| download | PROJ-6d6cbf8b69bbecb6db4156f20c04ec515611d0a4.tar.gz PROJ-6d6cbf8b69bbecb6db4156f20c04ec515611d0a4.zip | |
Merge pull request #2205 from PROJ-BOT/backport-2204-to-7.0
[Backport 7.0] Doc: fix/hacks for compatibility with Breathe 4.17.0 [skip appveyor]
| -rw-r--r-- | Doxyfile | 4 | ||||
| -rwxr-xr-x | scripts/doxygen.sh | 7 |
2 files changed, 10 insertions, 1 deletions
@@ -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/ <name>NONE<\/name>/ <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"><name>NONE<\/name><\/member>/refid="classosgeo_1_1proj_1_1common_1_1UnitOfMeasure_1a400c71b5a6d7927e3e5850cee2b07d10ab50339a10e1de285ac99d4c3990b8693" kind="enumvalue"><name>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 |