Skip to content

doxygen: predefine non-standard specifiers and fix include paths #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025
Merged

doxygen: predefine non-standard specifiers and fix include paths #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2fac6e
Revert "doxygen: fix and improve macro expansion configuration option…
eramongodb Mar 17, 2025
b55141f
doxygen: predefine non-standard specifiers and fix include paths
eramongodb Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2412,7 +2412,9 @@ SEARCH_INCLUDES = YES
# RECURSIVE has no effect here.
# This tag requires that the tag SEARCH_INCLUDES is set to YES.

INCLUDE_PATH = build/doxygen/install/include
INCLUDE_PATH = build/doxygen/install/include/bsoncxx/v_noabi \
build/doxygen/install/include/mongocxx/v_noabi \
build/doxygen/install/include

# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the
Expand All @@ -2430,13 +2432,11 @@ 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 = BSONCXX_ABI_CDECL= \
BSONCXX_ABI_EXPORT= \
BSONCXX_ABI_EXPORT_CDECL(...)=__VA_ARGS__ \
PREDEFINED = __attribute__(...)= \
__declspec(...)= \
_Pragma(...)= \
__pragma(...)= \
BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR= \
MONGOCXX_ABI_CDECL= \
MONGOCXX_ABI_EXPORT= \
MONGOCXX_ABI_EXPORT_CDECL(...)=__VA_ARGS__ \
MONGOCXX_PRIVATE_DOXYGEN_PREPROCESSOR=

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
Expand Down
5 changes: 0 additions & 5 deletions src/bsoncxx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,6 @@ if(1)
/// @warning For internal use only!
///

// Doxygen `PREDEFINED` does not define the macro *in code* as required by `@def`.
#if defined(BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR)
#define BSONCXX_ABI_EXPORT ...
#endif

///
/// @def BSONCXX_ABI_EXPORT
/// @hideinitializer
Expand Down
5 changes: 0 additions & 5 deletions src/mongocxx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ if(1)

#define MONGOCXX_ABI_EXPORT_CDECL(...) MONGOCXX_ABI_EXPORT __VA_ARGS__ MONGOCXX_ABI_CDECL

// Doxygen `PREDEFINED` does not define the macro *in code* as required by `@def`.
#if defined(MONGOCXX_PRIVATE_DOXYGEN_PREPROCESSOR)
#define MONGOCXX_ABI_EXPORT ...
#endif

///
/// @file
/// Provides macros to control the set of symbols exported in the ABI.
Expand Down