[geos-commits] [SCM] GEOS branch master updated. 54c1b88be087e30cf3af17893803acb3c74095b6

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  54c1b88be087e30cf3af17893803acb3c74095b6 (commit)
       via  e6ecb28f73709eb4b81456e93c7b09723fe8084e (commit)
      from  bdc41b10bb5f883c3379c4ce09093f5c382aef93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 54c1b88be087e30cf3af17893803acb3c74095b6
Merge: bdc41b1 e6ecb28
Author: dbaston <dbaston at gmail.com>
Date:   Fri Sep 27 04:02:50 2019 -0700

    Merge branch 'doxygen-predefined-macro' of nila/geos into master


commit e6ecb28f73709eb4b81456e93c7b09723fe8084e
Author: nila <n_larsson at yahoo.com>
Date:   Mon Sep 23 16:44:04 2019 +0200

    Enable macro expansion.
    
    Enables macro expansion with GEOS_DLL predefined. Addresses issue with doxygen generation of geom::Location

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index fd61667..c841508 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -2017,7 +2017,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -2057,7 +2057,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             =
+PREDEFINED             = GEOS_DLL
 
 # 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

-----------------------------------------------------------------------

Summary of changes:
 doc/Doxyfile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS