CXX-2745 apply precursor changes to Doxygen and CMake configs

Doxyfile

@@ -507,7 +507,7 @@ EXTRACT_STATIC         = NO
 # for Java sources.
 # The default value is: YES.
 
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES  = NO
 
 # This flag is only useful for Objective-C code. If set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
@@ -604,7 +604,7 @@ HIDE_COMPOUND_REFERENCE= NO
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
-SHOW_INCLUDE_FILES     = YES
+SHOW_INCLUDE_FILES     = NO
 
 # If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
 # grouped member an include statement to the documentation, telling the reader
@@ -2188,7 +2188,10 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = src/bsoncxx/include/bsoncxx/v_noabi
+INCLUDE_PATH           = src/bsoncxx/include/bsoncxx/v_noabi \
+                         src/mongocxx/include/mongocxx/v_noabi \
+                         src/bsoncxx/include \
+                         src/mongocxx/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
@@ -2355,7 +2358,7 @@ DOT_FONTPATH           =
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-CLASS_GRAPH            = YES
+CLASS_GRAPH            = NO
 
 # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation

src/bsoncxx/include/CMakeLists.txt

@@ -18,91 +18,13 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
     FILES_MATCHING PATTERN "*.hpp"
 )
 
+file(GLOB_RECURSE bsoncxx_include_headers
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    CONFIGURE_DEPENDS
+    "*.hpp"
+)
+
 set_dist_list(src_bsoncxx_include_DIST
     CMakeLists.txt
-    bsoncxx/v_noabi/bsoncxx/array/element-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/array/element.hpp
-    bsoncxx/v_noabi/bsoncxx/array/value-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/array/value.hpp
-    bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp
-    bsoncxx/v_noabi/bsoncxx/array/view-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/array/view.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/array-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/document-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/concatenate-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/core-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/core.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/list-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/list.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/array_context-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/array-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/document-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/helpers-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/key_context-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/single_context-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/value_context-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp
-    bsoncxx/v_noabi/bsoncxx/config/compiler.hpp
-    bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
-    bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
-    bsoncxx/v_noabi/bsoncxx/config/util.hpp
-    bsoncxx/v_noabi/bsoncxx/decimal128-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/decimal128.hpp
-    bsoncxx/v_noabi/bsoncxx/document/element-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/document/element.hpp
-    bsoncxx/v_noabi/bsoncxx/document/value-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/document/value.hpp
-    bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp
-    bsoncxx/v_noabi/bsoncxx/document/view-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/document/view.hpp
-    bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp
-    bsoncxx/v_noabi/bsoncxx/enums/type.hpp
-    bsoncxx/v_noabi/bsoncxx/exception/error_code-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
-    bsoncxx/v_noabi/bsoncxx/exception/exception-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
-    bsoncxx/v_noabi/bsoncxx/json-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/json.hpp
-    bsoncxx/v_noabi/bsoncxx/oid-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/oid.hpp
-    bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp
-    bsoncxx/v_noabi/bsoncxx/stdx/operators.hpp
-    bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
-    bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
-    bsoncxx/v_noabi/bsoncxx/stdx/type_traits.hpp
-    bsoncxx/v_noabi/bsoncxx/string/to_string.hpp
-    bsoncxx/v_noabi/bsoncxx/string/view_or_value-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp
-    bsoncxx/v_noabi/bsoncxx/types-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/types.hpp
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/value-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/view-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
-    bsoncxx/v_noabi/bsoncxx/types/value.hpp
-    bsoncxx/v_noabi/bsoncxx/util/functor.hpp
-    bsoncxx/v_noabi/bsoncxx/validate-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/validate.hpp
-    bsoncxx/v_noabi/bsoncxx/view_or_value-fwd.hpp
-    bsoncxx/v_noabi/bsoncxx/view_or_value.hpp
+    ${bsoncxx_include_headers}
 )

src/bsoncxx/lib/CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-list(APPEND bsoncxx_sources
+set(bsoncxx_sources_v_noabi
     bsoncxx/v_noabi/bsoncxx/array/element.cpp
     bsoncxx/v_noabi/bsoncxx/array/value.cpp
     bsoncxx/v_noabi/bsoncxx/array/view.cpp
@@ -31,6 +31,10 @@ list(APPEND bsoncxx_sources
     bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp
     bsoncxx/v_noabi/bsoncxx/validate.cpp
 )
+
+list(APPEND bsoncxx_sources
+    ${bsoncxx_sources_v_noabi}
+)
 list(TRANSFORM bsoncxx_sources PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/")
 set(bsoncxx_sources "${bsoncxx_sources}" PARENT_SCOPE)
 
@@ -64,35 +68,19 @@ endif()
 
 set_dist_list(src_bsoncxx_lib_DIST
     CMakeLists.txt
-    bsoncxx/v_noabi/bsoncxx/array/element.cpp
-    bsoncxx/v_noabi/bsoncxx/array/value.cpp
-    bsoncxx/v_noabi/bsoncxx/array/view.cpp
-    bsoncxx/v_noabi/bsoncxx/builder/core.cpp
+    ${bsoncxx_sources_v_noabi}
     bsoncxx/v_noabi/bsoncxx/config/config.hpp.in
     bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in
     bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh
     bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh
     bsoncxx/v_noabi/bsoncxx/config/version.hpp.in
-    bsoncxx/v_noabi/bsoncxx/decimal128.cpp
-    bsoncxx/v_noabi/bsoncxx/document/element.cpp
-    bsoncxx/v_noabi/bsoncxx/document/value.cpp
-    bsoncxx/v_noabi/bsoncxx/document/view.cpp
-    bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp
-    bsoncxx/v_noabi/bsoncxx/json.cpp
-    bsoncxx/v_noabi/bsoncxx/oid.cpp
     bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh
     bsoncxx/v_noabi/bsoncxx/private/helpers.hh
-    bsoncxx/v_noabi/bsoncxx/private/itoa.cpp
     bsoncxx/v_noabi/bsoncxx/private/itoa.hh
     bsoncxx/v_noabi/bsoncxx/private/libbson.hh
     bsoncxx/v_noabi/bsoncxx/private/stack.hh
     bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh
-    bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp
     bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh
-    bsoncxx/v_noabi/bsoncxx/types.cpp
     bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp
-    bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp
     bsoncxx/v_noabi/bsoncxx/types/private/convert.hh
-    bsoncxx/v_noabi/bsoncxx/validate.cpp
 )

src/bsoncxx/test/CMakeLists.txt

@@ -122,8 +122,9 @@ if(ENABLE_MACRO_GUARD_TESTS)
             "lib/*.hh" # Private headers.
             "test/*.hh" # Test headers.
         EXCLUDE_REGEXES
-            "(include|lib)/bsoncxx/v.*/config/.*" # Config headers.
-            "include/bsoncxx/v_noabi/bsoncxx/enums/.*" # X macro headers.
+            "(include|lib)/.*/(prelude|postlude)\.(hpp|hh)" # Macro guard headers.
+            "(include|lib)/bsoncxx/v_noabi/bsoncxx/config/.*" # v_noabi config headers.
+            "include/bsoncxx/v_noabi/bsoncxx/enums/.*" # v_noabi X-macro headers.
             ".*_symbols.hh" # Symbol headers.
     )
 endif()