From 2005698ea43d16d703b86b079742cd95d64367be Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 18 Sep 2023 15:54:39 -0500 Subject: [PATCH 1/9] Use full `third_party/catch/include` prefix in include directives --- src/bsoncxx/test/CMakeLists.txt | 5 ++--- src/mongocxx/test/CMakeLists.txt | 5 ++--- src/mongocxx/test/client.cpp | 2 +- src/mongocxx/test/client_session.cpp | 2 +- src/mongocxx/test/client_side_encryption.cpp | 2 +- src/mongocxx/test/collection_mocked.cpp | 2 +- src/mongocxx/test/database.cpp | 2 +- src/mongocxx/test/model/delete_many.cpp | 2 +- src/mongocxx/test/model/delete_one.cpp | 2 +- src/mongocxx/test/model/replace_one.cpp | 4 ++-- src/mongocxx/test/model/update_many.cpp | 4 ++-- src/mongocxx/test/model/update_one.cpp | 2 +- src/mongocxx/test/options/aggregate.cpp | 2 +- src/mongocxx/test/options/bulk_write.cpp | 2 +- src/mongocxx/test/options/count.cpp | 2 +- src/mongocxx/test/options/create_collection.cpp | 2 +- src/mongocxx/test/options/delete.cpp | 2 +- src/mongocxx/test/options/distinct.cpp | 2 +- src/mongocxx/test/options/find.cpp | 2 +- src/mongocxx/test/options/find_one_and_delete.cpp | 2 +- src/mongocxx/test/options/find_one_and_replace.cpp | 2 +- src/mongocxx/test/options/find_one_and_update.cpp | 2 +- src/mongocxx/test/options/gridfs/bucket.cpp | 2 +- src/mongocxx/test/options/gridfs/upload.cpp | 2 +- src/mongocxx/test/options/index.cpp | 2 +- src/mongocxx/test/options/insert.cpp | 2 +- src/mongocxx/test/options/replace.cpp | 2 +- src/mongocxx/test/options/update.cpp | 2 +- src/mongocxx/test/pool.cpp | 2 +- src/mongocxx/test/read_preference.cpp | 2 +- src/mongocxx/test/spec/unified_tests/operations.cpp | 2 +- src/mongocxx/test/validation_criteria.cpp | 2 +- src/third_party/catch/main.cpp | 2 +- 33 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/bsoncxx/test/CMakeLists.txt b/src/bsoncxx/test/CMakeLists.txt index 8572aa8573..35bc52b3b8 100644 --- a/src/bsoncxx/test/CMakeLists.txt +++ b/src/bsoncxx/test/CMakeLists.txt @@ -16,9 +16,8 @@ if(NOT BUILD_TESTING) set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL TRUE) endif() -include_directories( - ${MONGO_CXX_DRIVER_SOURCE_DIR}/src/third_party/catch/include -) +# Allow `#include ` +include_directories(${THIRD_PARTY_SOURCE_DIR}/..) file (GLOB src_bsoncxx_test_DIST_cpps RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) diff --git a/src/mongocxx/test/CMakeLists.txt b/src/mongocxx/test/CMakeLists.txt index 7dd71b9ed1..9bc8c704a7 100644 --- a/src/mongocxx/test/CMakeLists.txt +++ b/src/mongocxx/test/CMakeLists.txt @@ -16,9 +16,8 @@ if(NOT BUILD_TESTING) set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL TRUE) endif() -include_directories( - ${THIRD_PARTY_SOURCE_DIR}/catch/include -) +# Allow `#include ` +include_directories(${THIRD_PARTY_SOURCE_DIR}/..) set(test_driver_sources CMakeLists.txt diff --git a/src/mongocxx/test/client.cpp b/src/mongocxx/test/client.cpp index 0603abfc95..4f6d44287e 100644 --- a/src/mongocxx/test/client.cpp +++ b/src/mongocxx/test/client.cpp @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include #include diff --git a/src/mongocxx/test/client_session.cpp b/src/mongocxx/test/client_session.cpp index 5e26cd0ff7..4ef274ce65 100644 --- a/src/mongocxx/test/client_session.cpp +++ b/src/mongocxx/test/client_session.cpp @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include #include @@ -25,6 +24,7 @@ #include #include #include +#include namespace { using bsoncxx::from_json; diff --git a/src/mongocxx/test/client_side_encryption.cpp b/src/mongocxx/test/client_side_encryption.cpp index fb57e815a9..ab9a9b6a45 100644 --- a/src/mongocxx/test/client_side_encryption.cpp +++ b/src/mongocxx/test/client_side_encryption.cpp @@ -13,7 +13,6 @@ // limitations under the License. #include -#include #include #include #include @@ -42,6 +41,7 @@ #include #include #include +#include namespace { const auto kLocalMasterKey = diff --git a/src/mongocxx/test/collection_mocked.cpp b/src/mongocxx/test/collection_mocked.cpp index 6689c53baf..de669f5d79 100644 --- a/src/mongocxx/test/collection_mocked.cpp +++ b/src/mongocxx/test/collection_mocked.cpp @@ -15,7 +15,6 @@ #include #include -#include "helpers.hpp" #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include namespace { using namespace mongocxx; diff --git a/src/mongocxx/test/database.cpp b/src/mongocxx/test/database.cpp index 0816ca897e..660f5e223e 100644 --- a/src/mongocxx/test/database.cpp +++ b/src/mongocxx/test/database.cpp @@ -14,7 +14,6 @@ #include -#include "helpers.hpp" #include #include #include @@ -29,6 +28,7 @@ #include #include #include +#include namespace { using namespace mongocxx; diff --git a/src/mongocxx/test/model/delete_many.cpp b/src/mongocxx/test/model/delete_many.cpp index 9f84c97228..1c6ee0c2f0 100644 --- a/src/mongocxx/test/model/delete_many.cpp +++ b/src/mongocxx/test/model/delete_many.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/model/delete_one.cpp b/src/mongocxx/test/model/delete_one.cpp index 09ad2d5213..c313a7dd39 100644 --- a/src/mongocxx/test/model/delete_one.cpp +++ b/src/mongocxx/test/model/delete_one.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/model/replace_one.cpp b/src/mongocxx/test/model/replace_one.cpp index 3b337941f7..727a6495b3 100644 --- a/src/mongocxx/test/model/replace_one.cpp +++ b/src/mongocxx/test/model/replace_one.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; @@ -38,4 +38,4 @@ TEST_CASE("replace_one model tests", "[replace_one][model]") { CHECK_OPTIONAL_ARGUMENT(ro, upsert, true); CHECK_OPTIONAL_ARGUMENT(ro, collation, collation.view()); } -} // namespace \ No newline at end of file +} // namespace diff --git a/src/mongocxx/test/model/update_many.cpp b/src/mongocxx/test/model/update_many.cpp index d144edb035..146a58c1db 100644 --- a/src/mongocxx/test/model/update_many.cpp +++ b/src/mongocxx/test/model/update_many.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; @@ -41,4 +41,4 @@ TEST_CASE("update_many model tests", "[update_many][model]") { CHECK_OPTIONAL_ARGUMENT(um, collation, collation.view()); CHECK_OPTIONAL_ARGUMENT(um, array_filters, array_filters.view()); } -} // namespace \ No newline at end of file +} // namespace diff --git a/src/mongocxx/test/model/update_one.cpp b/src/mongocxx/test/model/update_one.cpp index 337c7d47ca..98e8bacf0a 100644 --- a/src/mongocxx/test/model/update_one.cpp +++ b/src/mongocxx/test/model/update_one.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/aggregate.cpp b/src/mongocxx/test/options/aggregate.cpp index deb5188c98..6b2a22a146 100644 --- a/src/mongocxx/test/options/aggregate.cpp +++ b/src/mongocxx/test/options/aggregate.cpp @@ -14,12 +14,12 @@ #include -#include "helpers.hpp" #include #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/bulk_write.cpp b/src/mongocxx/test/options/bulk_write.cpp index d750d4b96b..5eac143e80 100644 --- a/src/mongocxx/test/options/bulk_write.cpp +++ b/src/mongocxx/test/options/bulk_write.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include +#include namespace { using namespace mongocxx; diff --git a/src/mongocxx/test/options/count.cpp b/src/mongocxx/test/options/count.cpp index 47fe1bd337..db64310662 100644 --- a/src/mongocxx/test/options/count.cpp +++ b/src/mongocxx/test/options/count.cpp @@ -14,11 +14,11 @@ #include -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/create_collection.cpp b/src/mongocxx/test/options/create_collection.cpp index ea1d3f40a4..d7300e71c1 100644 --- a/src/mongocxx/test/options/create_collection.cpp +++ b/src/mongocxx/test/options/create_collection.cpp @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include @@ -22,6 +21,7 @@ #include #include #include +#include namespace { using namespace bsoncxx; diff --git a/src/mongocxx/test/options/delete.cpp b/src/mongocxx/test/options/delete.cpp index e1df22e934..0d075e7f0d 100644 --- a/src/mongocxx/test/options/delete.cpp +++ b/src/mongocxx/test/options/delete.cpp @@ -14,11 +14,11 @@ #include -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/distinct.cpp b/src/mongocxx/test/options/distinct.cpp index ac46a2a229..13eecaf2f7 100644 --- a/src/mongocxx/test/options/distinct.cpp +++ b/src/mongocxx/test/options/distinct.cpp @@ -14,11 +14,11 @@ #include -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/find.cpp b/src/mongocxx/test/options/find.cpp index 15adedbf25..3bbc9a0021 100644 --- a/src/mongocxx/test/options/find.cpp +++ b/src/mongocxx/test/options/find.cpp @@ -14,11 +14,11 @@ #include -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/find_one_and_delete.cpp b/src/mongocxx/test/options/find_one_and_delete.cpp index 8fcfeabb4f..5bbbedaf64 100644 --- a/src/mongocxx/test/options/find_one_and_delete.cpp +++ b/src/mongocxx/test/options/find_one_and_delete.cpp @@ -14,11 +14,11 @@ #include -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/find_one_and_replace.cpp b/src/mongocxx/test/options/find_one_and_replace.cpp index 327eb8434d..0304507860 100644 --- a/src/mongocxx/test/options/find_one_and_replace.cpp +++ b/src/mongocxx/test/options/find_one_and_replace.cpp @@ -14,11 +14,11 @@ #include -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/find_one_and_update.cpp b/src/mongocxx/test/options/find_one_and_update.cpp index d360e6ff38..4d5214eb61 100644 --- a/src/mongocxx/test/options/find_one_and_update.cpp +++ b/src/mongocxx/test/options/find_one_and_update.cpp @@ -14,12 +14,12 @@ #include -#include "helpers.hpp" #include #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/gridfs/bucket.cpp b/src/mongocxx/test/options/gridfs/bucket.cpp index d41837788f..9474b8eef5 100644 --- a/src/mongocxx/test/options/gridfs/bucket.cpp +++ b/src/mongocxx/test/options/gridfs/bucket.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include #include #include +#include namespace { using namespace mongocxx; diff --git a/src/mongocxx/test/options/gridfs/upload.cpp b/src/mongocxx/test/options/gridfs/upload.cpp index 5c96996352..d35fd39abb 100644 --- a/src/mongocxx/test/options/gridfs/upload.cpp +++ b/src/mongocxx/test/options/gridfs/upload.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include #include +#include namespace { using namespace bsoncxx; diff --git a/src/mongocxx/test/options/index.cpp b/src/mongocxx/test/options/index.cpp index fa147bc950..c7d6578a47 100644 --- a/src/mongocxx/test/options/index.cpp +++ b/src/mongocxx/test/options/index.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/insert.cpp b/src/mongocxx/test/options/insert.cpp index af6375075e..272072b494 100644 --- a/src/mongocxx/test/options/insert.cpp +++ b/src/mongocxx/test/options/insert.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include +#include namespace { using namespace mongocxx; diff --git a/src/mongocxx/test/options/replace.cpp b/src/mongocxx/test/options/replace.cpp index ff5a4baf9d..8ec8cf8fee 100644 --- a/src/mongocxx/test/options/replace.cpp +++ b/src/mongocxx/test/options/replace.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/options/update.cpp b/src/mongocxx/test/options/update.cpp index dc12343610..26b0ce83bf 100644 --- a/src/mongocxx/test/options/update.cpp +++ b/src/mongocxx/test/options/update.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include +#include namespace { using namespace bsoncxx::builder::basic; diff --git a/src/mongocxx/test/pool.cpp b/src/mongocxx/test/pool.cpp index e13a1c6a8d..8cfb5a1c69 100644 --- a/src/mongocxx/test/pool.cpp +++ b/src/mongocxx/test/pool.cpp @@ -15,7 +15,6 @@ #include #include -#include "helpers.hpp" #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include #include diff --git a/src/mongocxx/test/read_preference.cpp b/src/mongocxx/test/read_preference.cpp index 1b0ba52e5c..d4eaedf62f 100644 --- a/src/mongocxx/test/read_preference.cpp +++ b/src/mongocxx/test/read_preference.cpp @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include @@ -21,6 +20,7 @@ #include #include #include +#include namespace { using namespace bsoncxx; diff --git a/src/mongocxx/test/spec/unified_tests/operations.cpp b/src/mongocxx/test/spec/unified_tests/operations.cpp index 5b8e323f3f..65f69642ab 100644 --- a/src/mongocxx/test/spec/unified_tests/operations.cpp +++ b/src/mongocxx/test/spec/unified_tests/operations.cpp @@ -14,7 +14,6 @@ #include "operations.hh" -#include #include #include @@ -25,6 +24,7 @@ #include #include #include +#include namespace mongocxx { MONGOCXX_INLINE_NAMESPACE_BEGIN diff --git a/src/mongocxx/test/validation_criteria.cpp b/src/mongocxx/test/validation_criteria.cpp index d075290ece..eec76e1192 100644 --- a/src/mongocxx/test/validation_criteria.cpp +++ b/src/mongocxx/test/validation_criteria.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "helpers.hpp" #include #include #include #include #include #include +#include namespace { using namespace mongocxx; diff --git a/src/third_party/catch/main.cpp b/src/third_party/catch/main.cpp index 3ee893a715..aa1ea68fba 100644 --- a/src/third_party/catch/main.cpp +++ b/src/third_party/catch/main.cpp @@ -13,4 +13,4 @@ // limitations under the License. #define CATCH_CONFIG_MAIN -#include "catch.hpp" +#include From d40f9251b7154b64605a1054739b659df54a9ec8 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 18 Sep 2023 16:13:27 -0500 Subject: [PATCH 2/9] CXX-2753 Move library sources into v_noabi subdirectories --- cmake/BsoncxxUtil.cmake | 7 +- cmake/MongocxxUtil.cmake | 8 +- src/bsoncxx/CMakeLists.txt | 203 +++--- .../v_noabi/bsoncxx}/array/element.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/array/value.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/array/view.hpp | 0 .../v_noabi/bsoncxx}/array/view_or_value.hpp | 0 .../v_noabi/bsoncxx}/builder/basic/array.hpp | 0 .../bsoncxx}/builder/basic/document.hpp | 0 .../bsoncxx}/builder/basic/helpers.hpp | 0 .../v_noabi/bsoncxx}/builder/basic/impl.hpp | 0 .../v_noabi/bsoncxx}/builder/basic/kvp.hpp | 0 .../bsoncxx}/builder/basic/sub_array.hpp | 0 .../bsoncxx}/builder/basic/sub_document.hpp | 0 .../v_noabi/bsoncxx}/builder/concatenate.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/builder/core.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/builder/list.hpp | 0 .../v_noabi/bsoncxx}/builder/stream/array.hpp | 0 .../bsoncxx}/builder/stream/array_context.hpp | 0 .../builder/stream/closed_context.hpp | 0 .../bsoncxx}/builder/stream/document.hpp | 0 .../bsoncxx}/builder/stream/helpers.hpp | 0 .../bsoncxx}/builder/stream/key_context.hpp | 0 .../builder/stream/single_context.hpp | 0 .../bsoncxx}/builder/stream/value_context.hpp | 0 .../v_noabi/bsoncxx}/config/compiler.hpp | 0 .../v_noabi/bsoncxx}/config/postlude.hpp | 0 .../v_noabi/bsoncxx}/config/prelude.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/decimal128.hpp | 0 .../v_noabi/bsoncxx}/document/element.hpp | 0 .../v_noabi/bsoncxx}/document/value.hpp | 0 .../v_noabi/bsoncxx}/document/view.hpp | 0 .../bsoncxx}/document/view_or_value.hpp | 0 .../bsoncxx}/enums/binary_sub_type.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/enums/type.hpp | 0 .../v_noabi/bsoncxx}/exception/error_code.hpp | 0 .../v_noabi/bsoncxx}/exception/exception.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/json.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/oid.hpp | 0 .../v_noabi/bsoncxx}/stdx/make_unique.hpp | 0 .../v_noabi/bsoncxx}/stdx/optional.hpp | 0 .../v_noabi/bsoncxx}/stdx/string_view.hpp | 0 .../v_noabi/bsoncxx}/string/to_string.hpp | 0 .../v_noabi/bsoncxx}/string/view_or_value.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/types.hpp | 0 .../bsoncxx}/types/bson_value/make_value.hpp | 0 .../bsoncxx}/types/bson_value/value.hpp | 0 .../bsoncxx}/types/bson_value/view.hpp | 0 .../types/bson_value/view_or_value.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/types/value.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/util/functor.hpp | 0 .../bsoncxx/v_noabi/bsoncxx}/validate.hpp | 0 .../v_noabi/bsoncxx}/view_or_value.hpp | 0 .../v_noabi/bsoncxx}/array/element.cpp | 0 .../bsoncxx/v_noabi/bsoncxx}/array/value.cpp | 0 .../bsoncxx/v_noabi/bsoncxx}/array/view.cpp | 0 .../bsoncxx/v_noabi/bsoncxx}/builder/core.cpp | 0 .../v_noabi/bsoncxx}/config/CMakeLists.txt | 3 - .../v_noabi/bsoncxx}/config/config.hpp.in | 0 .../bsoncxx}/config/libbsoncxx-static.pc.in | 0 .../v_noabi/bsoncxx}/config/libbsoncxx.pc.in | 0 .../bsoncxx}/config/private/config.hh.in | 0 .../bsoncxx}/config/private/postlude.hh | 0 .../bsoncxx}/config/private/prelude.hh | 0 .../v_noabi/bsoncxx}/config/version.hpp.in | 0 .../bsoncxx/v_noabi/bsoncxx}/decimal128.cpp | 0 .../v_noabi/bsoncxx}/document/element.cpp | 0 .../v_noabi/bsoncxx}/document/value.cpp | 0 .../v_noabi/bsoncxx}/document/view.cpp | 0 .../v_noabi/bsoncxx}/exception/error_code.cpp | 0 .../bsoncxx/v_noabi/bsoncxx}/json.cpp | 0 .../{ => lib/bsoncxx/v_noabi/bsoncxx}/oid.cpp | 0 .../v_noabi/bsoncxx}/private/b64_ntop.hh | 0 .../v_noabi/bsoncxx}/private/helpers.hh | 0 .../bsoncxx/v_noabi/bsoncxx}/private/itoa.cpp | 0 .../bsoncxx/v_noabi/bsoncxx}/private/itoa.hh | 0 .../v_noabi/bsoncxx}/private/libbson.hh | 0 .../bsoncxx/v_noabi/bsoncxx}/private/stack.hh | 0 .../private/suppress_deprecation_warnings.hh | 0 .../v_noabi/bsoncxx}/string/view_or_value.cpp | 0 .../v_noabi/bsoncxx}/test_util/catch.hh | 0 .../bsoncxx}/test_util/export_for_testing.hh | 0 .../v_noabi/bsoncxx}/test_util/to_string.hh | 0 .../bsoncxx/v_noabi/bsoncxx}/types.cpp | 0 .../types/bson_value/private/value.hh | 0 .../bsoncxx}/types/bson_value/value.cpp | 0 .../bsoncxx}/types/bson_value/view.cpp | 0 .../v_noabi/bsoncxx}/types/private/convert.hh | 0 .../bsoncxx/v_noabi/bsoncxx}/validate.cpp | 0 src/mongocxx/CMakeLists.txt | 661 +++++++++--------- .../mongocxx/v_noabi/mongocxx}/bulk_write.hpp | 0 .../v_noabi/mongocxx}/change_stream.hpp | 0 .../mongocxx/v_noabi/mongocxx}/client.hpp | 0 .../v_noabi/mongocxx}/client_encryption.hpp | 0 .../v_noabi/mongocxx}/client_session.hpp | 0 .../mongocxx/v_noabi/mongocxx}/collection.hpp | 0 .../v_noabi/mongocxx}/config/compiler.hpp | 0 .../v_noabi/mongocxx}/config/postlude.hpp | 0 .../v_noabi/mongocxx}/config/prelude.hpp | 0 .../mongocxx/v_noabi/mongocxx}/cursor.hpp | 0 .../mongocxx/v_noabi/mongocxx}/database.hpp | 0 .../mongocxx}/events/command_failed_event.hpp | 0 .../events/command_started_event.hpp | 0 .../events/command_succeeded_event.hpp | 0 .../events/heartbeat_failed_event.hpp | 0 .../events/heartbeat_started_event.hpp | 0 .../events/heartbeat_succeeded_event.hpp | 0 .../mongocxx}/events/server_changed_event.hpp | 0 .../mongocxx}/events/server_closed_event.hpp | 0 .../mongocxx}/events/server_description.hpp | 0 .../mongocxx}/events/server_opening_event.hpp | 0 .../events/topology_changed_event.hpp | 0 .../events/topology_closed_event.hpp | 0 .../mongocxx}/events/topology_description.hpp | 0 .../events/topology_opening_event.hpp | 0 .../exception/authentication_exception.hpp | 0 .../exception/bulk_write_exception.hpp | 0 .../mongocxx}/exception/error_code.hpp | 0 .../v_noabi/mongocxx}/exception/exception.hpp | 0 .../mongocxx}/exception/gridfs_exception.hpp | 0 .../mongocxx}/exception/logic_error.hpp | 0 .../exception/operation_exception.hpp | 0 .../mongocxx}/exception/query_exception.hpp | 0 .../mongocxx}/exception/server_error_code.hpp | 0 .../mongocxx}/exception/write_exception.hpp | 0 .../v_noabi/mongocxx}/gridfs/bucket.hpp | 0 .../v_noabi/mongocxx}/gridfs/downloader.hpp | 0 .../v_noabi/mongocxx}/gridfs/uploader.hpp | 0 .../mongocxx/v_noabi/mongocxx}/hint.hpp | 0 .../v_noabi/mongocxx}/index_model.hpp | 0 .../mongocxx/v_noabi/mongocxx}/index_view.hpp | 0 .../mongocxx/v_noabi/mongocxx}/instance.hpp | 0 .../mongocxx/v_noabi/mongocxx}/logger.hpp | 0 .../v_noabi/mongocxx}/model/delete_many.hpp | 0 .../v_noabi/mongocxx}/model/delete_one.hpp | 0 .../v_noabi/mongocxx}/model/insert_one.hpp | 0 .../v_noabi/mongocxx}/model/replace_one.hpp | 0 .../v_noabi/mongocxx}/model/update_many.hpp | 0 .../v_noabi/mongocxx}/model/update_one.hpp | 0 .../v_noabi/mongocxx}/model/write.hpp | 0 .../v_noabi/mongocxx}/options/aggregate.hpp | 0 .../v_noabi/mongocxx}/options/apm.hpp | 0 .../mongocxx}/options/auto_encryption.hpp | 0 .../v_noabi/mongocxx}/options/bulk_write.hpp | 0 .../mongocxx}/options/change_stream.hpp | 0 .../v_noabi/mongocxx}/options/client.hpp | 0 .../mongocxx}/options/client_encryption.hpp | 0 .../mongocxx}/options/client_session.hpp | 0 .../v_noabi/mongocxx}/options/count.hpp | 0 .../mongocxx}/options/create_collection.hpp | 0 .../v_noabi/mongocxx}/options/data_key.hpp | 0 .../v_noabi/mongocxx}/options/delete.hpp | 0 .../v_noabi/mongocxx}/options/distinct.hpp | 0 .../v_noabi/mongocxx}/options/encrypt.hpp | 0 .../options/estimated_document_count.hpp | 0 .../v_noabi/mongocxx}/options/find.hpp | 0 .../mongocxx}/options/find_one_and_delete.hpp | 0 .../options/find_one_and_replace.hpp | 0 .../mongocxx}/options/find_one_and_update.hpp | 0 .../options/find_one_common_options.hpp | 0 .../mongocxx}/options/gridfs/bucket.hpp | 0 .../mongocxx}/options/gridfs/upload.hpp | 0 .../v_noabi/mongocxx}/options/index.hpp | 0 .../v_noabi/mongocxx}/options/index_view.hpp | 0 .../v_noabi/mongocxx}/options/insert.hpp | 0 .../v_noabi/mongocxx}/options/pool.hpp | 0 .../v_noabi/mongocxx}/options/range.hpp | 0 .../v_noabi/mongocxx}/options/replace.hpp | 0 .../mongocxx}/options/rewrap_many_datakey.hpp | 0 .../v_noabi/mongocxx}/options/server_api.hpp | 0 .../v_noabi/mongocxx}/options/ssl.hpp | 0 .../v_noabi/mongocxx}/options/tls.hpp | 0 .../v_noabi/mongocxx}/options/transaction.hpp | 0 .../v_noabi/mongocxx}/options/update.hpp | 0 .../mongocxx/v_noabi/mongocxx}/pipeline.hpp | 0 .../mongocxx/v_noabi/mongocxx}/pool.hpp | 0 .../v_noabi/mongocxx}/read_concern.hpp | 0 .../v_noabi/mongocxx}/read_preference.hpp | 0 .../v_noabi/mongocxx}/result/bulk_write.hpp | 0 .../v_noabi/mongocxx}/result/delete.hpp | 0 .../mongocxx}/result/gridfs/upload.hpp | 0 .../v_noabi/mongocxx}/result/insert_many.hpp | 0 .../v_noabi/mongocxx}/result/insert_one.hpp | 0 .../v_noabi/mongocxx}/result/replace_one.hpp | 0 .../mongocxx}/result/rewrap_many_datakey.hpp | 0 .../v_noabi/mongocxx}/result/update.hpp | 0 .../v_noabi/mongocxx}/search_index_model.hpp | 0 .../v_noabi/mongocxx}/search_index_view.hpp | 0 .../mongocxx/v_noabi/mongocxx}/stdx.hpp | 0 .../mongocxx/v_noabi/mongocxx}/uri.hpp | 0 .../v_noabi/mongocxx}/validation_criteria.hpp | 0 .../v_noabi/mongocxx}/write_concern.hpp | 0 .../mongocxx/v_noabi/mongocxx}/write_type.hpp | 0 .../mongocxx/v_noabi/mongocxx}/bulk_write.cpp | 0 .../v_noabi/mongocxx}/change_stream.cpp | 0 .../mongocxx/v_noabi/mongocxx}/client.cpp | 0 .../v_noabi/mongocxx}/client_encryption.cpp | 0 .../v_noabi/mongocxx}/client_session.cpp | 0 .../mongocxx/v_noabi/mongocxx}/collection.cpp | 0 .../v_noabi/mongocxx}/config/CMakeLists.txt | 3 - .../v_noabi/mongocxx}/config/config.hpp.in | 0 .../mongocxx}/config/libmongocxx-static.pc.in | 0 .../mongocxx}/config/libmongocxx.pc.in | 0 .../mongocxx}/config/private/config.hh.in | 0 .../mongocxx}/config/private/postlude.hh | 0 .../mongocxx}/config/private/prelude.hh | 0 .../v_noabi/mongocxx}/config/version.hpp.in | 0 .../mongocxx/v_noabi/mongocxx}/cursor.cpp | 0 .../mongocxx/v_noabi/mongocxx}/database.cpp | 0 .../mongocxx}/events/command_failed_event.cpp | 0 .../events/command_started_event.cpp | 0 .../events/command_succeeded_event.cpp | 0 .../events/heartbeat_failed_event.cpp | 0 .../events/heartbeat_started_event.cpp | 0 .../events/heartbeat_succeeded_event.cpp | 0 .../mongocxx}/events/server_changed_event.cpp | 0 .../mongocxx}/events/server_closed_event.cpp | 0 .../mongocxx}/events/server_description.cpp | 0 .../mongocxx}/events/server_opening_event.cpp | 0 .../events/topology_changed_event.cpp | 0 .../events/topology_closed_event.cpp | 0 .../mongocxx}/events/topology_description.cpp | 0 .../events/topology_opening_event.cpp | 0 .../mongocxx}/exception/error_code.cpp | 0 .../exception/operation_exception.cpp | 0 .../exception/private/mongoc_error.hh | 0 .../mongocxx}/exception/server_error_code.cpp | 0 .../v_noabi/mongocxx}/gridfs/bucket.cpp | 0 .../v_noabi/mongocxx}/gridfs/downloader.cpp | 0 .../mongocxx}/gridfs/private/bucket.hh | 0 .../mongocxx}/gridfs/private/downloader.hh | 0 .../mongocxx}/gridfs/private/uploader.hh | 0 .../v_noabi/mongocxx}/gridfs/uploader.cpp | 0 .../mongocxx/v_noabi/mongocxx}/hint.cpp | 0 .../v_noabi/mongocxx}/index_model.cpp | 0 .../mongocxx/v_noabi/mongocxx}/index_view.cpp | 0 .../mongocxx/v_noabi/mongocxx}/instance.cpp | 0 .../mongocxx/v_noabi/mongocxx}/logger.cpp | 0 .../v_noabi/mongocxx}/model/delete_many.cpp | 0 .../v_noabi/mongocxx}/model/delete_one.cpp | 0 .../v_noabi/mongocxx}/model/insert_one.cpp | 0 .../v_noabi/mongocxx}/model/replace_one.cpp | 0 .../v_noabi/mongocxx}/model/update_many.cpp | 0 .../v_noabi/mongocxx}/model/update_one.cpp | 0 .../v_noabi/mongocxx}/model/write.cpp | 0 .../v_noabi/mongocxx}/options/aggregate.cpp | 0 .../v_noabi/mongocxx}/options/apm.cpp | 0 .../mongocxx}/options/auto_encryption.cpp | 0 .../v_noabi/mongocxx}/options/bulk_write.cpp | 0 .../mongocxx}/options/change_stream.cpp | 0 .../v_noabi/mongocxx}/options/client.cpp | 0 .../mongocxx}/options/client_encryption.cpp | 0 .../mongocxx}/options/client_session.cpp | 0 .../v_noabi/mongocxx}/options/count.cpp | 0 .../mongocxx}/options/create_collection.cpp | 0 .../v_noabi/mongocxx}/options/data_key.cpp | 0 .../v_noabi/mongocxx}/options/delete.cpp | 0 .../v_noabi/mongocxx}/options/distinct.cpp | 0 .../v_noabi/mongocxx}/options/encrypt.cpp | 0 .../options/estimated_document_count.cpp | 0 .../v_noabi/mongocxx}/options/find.cpp | 0 .../mongocxx}/options/find_one_and_delete.cpp | 0 .../options/find_one_and_replace.cpp | 0 .../mongocxx}/options/find_one_and_update.cpp | 0 .../mongocxx}/options/gridfs/bucket.cpp | 0 .../mongocxx}/options/gridfs/upload.cpp | 0 .../v_noabi/mongocxx}/options/index.cpp | 0 .../v_noabi/mongocxx}/options/index_view.cpp | 0 .../v_noabi/mongocxx}/options/insert.cpp | 0 .../v_noabi/mongocxx}/options/pool.cpp | 0 .../v_noabi/mongocxx}/options/private/apm.hh | 0 .../mongocxx}/options/private/server_api.hh | 0 .../v_noabi/mongocxx}/options/private/ssl.hh | 0 .../mongocxx}/options/private/transaction.hh | 0 .../v_noabi/mongocxx}/options/range.cpp | 0 .../v_noabi/mongocxx}/options/replace.cpp | 0 .../mongocxx}/options/rewrap_many_datakey.cpp | 0 .../v_noabi/mongocxx}/options/server_api.cpp | 0 .../v_noabi/mongocxx}/options/tls.cpp | 0 .../v_noabi/mongocxx}/options/transaction.cpp | 0 .../v_noabi/mongocxx}/options/update.cpp | 0 .../mongocxx/v_noabi/mongocxx}/pipeline.cpp | 0 .../mongocxx/v_noabi/mongocxx}/pool.cpp | 0 .../private/append_aggregate_options.hh | 0 .../v_noabi/mongocxx}/private/bulk_write.hh | 0 .../mongocxx}/private/change_stream.hh | 0 .../v_noabi/mongocxx}/private/client.hh | 0 .../mongocxx}/private/client_encryption.hh | 0 .../mongocxx}/private/client_session.hh | 0 .../v_noabi/mongocxx}/private/collection.hh | 0 .../v_noabi/mongocxx}/private/conversions.cpp | 0 .../v_noabi/mongocxx}/private/conversions.hh | 0 .../v_noabi/mongocxx}/private/cursor.hh | 0 .../v_noabi/mongocxx}/private/database.hh | 0 .../v_noabi/mongocxx}/private/index_view.hh | 0 .../v_noabi/mongocxx}/private/libbson.cpp | 0 .../v_noabi/mongocxx}/private/libbson.hh | 0 .../v_noabi/mongocxx}/private/libmongoc.cpp | 0 .../v_noabi/mongocxx}/private/libmongoc.hh | 0 .../mongocxx}/private/libmongoc_symbols.hh | 0 .../mongocxx}/private/numeric_casting.cpp | 0 .../mongocxx}/private/numeric_casting.hh | 0 .../v_noabi/mongocxx}/private/pipeline.hh | 0 .../v_noabi/mongocxx}/private/pool.hh | 0 .../v_noabi/mongocxx}/private/read_concern.hh | 0 .../mongocxx}/private/read_preference.hh | 0 .../mongocxx}/private/search_index_model.hh | 0 .../mongocxx}/private/search_index_view.hh | 0 .../mongocxx/v_noabi/mongocxx}/private/uri.hh | 0 .../mongocxx}/private/write_concern.hh | 0 .../v_noabi/mongocxx}/read_concern.cpp | 0 .../v_noabi/mongocxx}/read_preference.cpp | 0 .../v_noabi/mongocxx}/result/bulk_write.cpp | 0 .../v_noabi/mongocxx}/result/delete.cpp | 0 .../mongocxx}/result/gridfs/upload.cpp | 0 .../v_noabi/mongocxx}/result/insert_many.cpp | 0 .../v_noabi/mongocxx}/result/insert_one.cpp | 0 .../v_noabi/mongocxx}/result/replace_one.cpp | 0 .../mongocxx}/result/rewrap_many_datakey.cpp | 0 .../v_noabi/mongocxx}/result/update.cpp | 0 .../v_noabi/mongocxx}/search_index_model.cpp | 0 .../v_noabi/mongocxx}/search_index_view.cpp | 0 .../mongocxx}/test_util/client_helpers.cpp | 0 .../mongocxx}/test_util/client_helpers.hh | 0 .../mongocxx}/test_util/export_for_testing.hh | 0 .../v_noabi/mongocxx}/test_util/mock.hh | 0 .../mongocxx/v_noabi/mongocxx}/uri.cpp | 0 .../v_noabi/mongocxx}/validation_criteria.cpp | 0 .../v_noabi/mongocxx}/write_concern.cpp | 0 src/mongocxx/test/CMakeLists.txt | 24 +- 330 files changed, 460 insertions(+), 449 deletions(-) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/array/element.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/array/value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/array/view.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/array/view_or_value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/basic/array.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/basic/document.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/basic/helpers.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/basic/impl.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/basic/kvp.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/basic/sub_array.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/basic/sub_document.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/concatenate.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/core.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/list.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/array.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/array_context.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/closed_context.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/document.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/helpers.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/key_context.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/single_context.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/builder/stream/value_context.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/config/compiler.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/config/postlude.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/config/prelude.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/decimal128.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/document/element.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/document/value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/document/view.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/document/view_or_value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/enums/binary_sub_type.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/enums/type.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/exception/error_code.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/exception/exception.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/json.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/oid.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/stdx/make_unique.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/stdx/optional.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/stdx/string_view.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/string/to_string.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/string/view_or_value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/types.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/types/bson_value/make_value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/types/bson_value/value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/types/bson_value/view.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/types/bson_value/view_or_value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/types/value.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/util/functor.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/validate.hpp (100%) rename src/bsoncxx/{ => include/bsoncxx/v_noabi/bsoncxx}/view_or_value.hpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/array/element.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/array/value.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/array/view.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/builder/core.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/CMakeLists.txt (97%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/config.hpp.in (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/libbsoncxx-static.pc.in (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/libbsoncxx.pc.in (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/private/config.hh.in (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/private/postlude.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/private/prelude.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/config/version.hpp.in (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/decimal128.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/document/element.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/document/value.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/document/view.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/exception/error_code.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/json.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/oid.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/private/b64_ntop.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/private/helpers.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/private/itoa.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/private/itoa.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/private/libbson.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/private/stack.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/private/suppress_deprecation_warnings.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/string/view_or_value.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/test_util/catch.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/test_util/export_for_testing.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/test_util/to_string.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/types.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/types/bson_value/private/value.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/types/bson_value/value.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/types/bson_value/view.cpp (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/types/private/convert.hh (100%) rename src/bsoncxx/{ => lib/bsoncxx/v_noabi/bsoncxx}/validate.cpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/bulk_write.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/change_stream.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/client.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/client_encryption.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/client_session.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/collection.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/config/compiler.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/config/postlude.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/config/prelude.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/cursor.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/database.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/command_failed_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/command_started_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/command_succeeded_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/heartbeat_failed_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/heartbeat_started_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/heartbeat_succeeded_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/server_changed_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/server_closed_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/server_description.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/server_opening_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/topology_changed_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/topology_closed_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/topology_description.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/events/topology_opening_event.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/authentication_exception.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/bulk_write_exception.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/error_code.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/exception.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/gridfs_exception.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/logic_error.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/operation_exception.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/query_exception.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/server_error_code.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/exception/write_exception.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/gridfs/bucket.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/gridfs/downloader.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/gridfs/uploader.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/hint.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/index_model.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/index_view.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/instance.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/logger.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/model/delete_many.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/model/delete_one.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/model/insert_one.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/model/replace_one.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/model/update_many.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/model/update_one.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/model/write.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/aggregate.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/apm.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/auto_encryption.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/bulk_write.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/change_stream.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/client.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/client_encryption.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/client_session.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/count.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/create_collection.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/data_key.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/delete.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/distinct.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/encrypt.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/estimated_document_count.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/find.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/find_one_and_delete.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/find_one_and_replace.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/find_one_and_update.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/find_one_common_options.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/gridfs/bucket.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/gridfs/upload.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/index.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/index_view.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/insert.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/pool.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/range.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/replace.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/rewrap_many_datakey.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/server_api.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/ssl.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/tls.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/transaction.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/options/update.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/pipeline.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/pool.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/read_concern.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/read_preference.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/bulk_write.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/delete.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/gridfs/upload.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/insert_many.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/insert_one.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/replace_one.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/rewrap_many_datakey.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/result/update.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/search_index_model.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/search_index_view.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/stdx.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/uri.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/validation_criteria.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/write_concern.hpp (100%) rename src/mongocxx/{ => include/mongocxx/v_noabi/mongocxx}/write_type.hpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/bulk_write.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/change_stream.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/client.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/client_encryption.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/client_session.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/collection.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/CMakeLists.txt (98%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/config.hpp.in (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/libmongocxx-static.pc.in (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/libmongocxx.pc.in (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/private/config.hh.in (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/private/postlude.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/private/prelude.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/config/version.hpp.in (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/cursor.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/database.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/command_failed_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/command_started_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/command_succeeded_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/heartbeat_failed_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/heartbeat_started_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/heartbeat_succeeded_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/server_changed_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/server_closed_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/server_description.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/server_opening_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/topology_changed_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/topology_closed_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/topology_description.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/events/topology_opening_event.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/exception/error_code.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/exception/operation_exception.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/exception/private/mongoc_error.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/exception/server_error_code.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/gridfs/bucket.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/gridfs/downloader.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/gridfs/private/bucket.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/gridfs/private/downloader.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/gridfs/private/uploader.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/gridfs/uploader.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/hint.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/index_model.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/index_view.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/instance.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/logger.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/model/delete_many.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/model/delete_one.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/model/insert_one.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/model/replace_one.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/model/update_many.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/model/update_one.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/model/write.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/aggregate.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/apm.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/auto_encryption.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/bulk_write.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/change_stream.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/client.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/client_encryption.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/client_session.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/count.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/create_collection.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/data_key.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/delete.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/distinct.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/encrypt.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/estimated_document_count.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/find.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/find_one_and_delete.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/find_one_and_replace.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/find_one_and_update.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/gridfs/bucket.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/gridfs/upload.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/index.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/index_view.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/insert.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/pool.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/private/apm.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/private/server_api.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/private/ssl.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/private/transaction.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/range.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/replace.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/rewrap_many_datakey.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/server_api.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/tls.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/transaction.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/options/update.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/pipeline.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/pool.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/append_aggregate_options.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/bulk_write.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/change_stream.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/client.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/client_encryption.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/client_session.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/collection.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/conversions.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/conversions.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/cursor.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/database.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/index_view.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/libbson.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/libbson.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/libmongoc.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/libmongoc.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/libmongoc_symbols.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/numeric_casting.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/numeric_casting.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/pipeline.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/pool.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/read_concern.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/read_preference.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/search_index_model.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/search_index_view.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/uri.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/private/write_concern.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/read_concern.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/read_preference.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/bulk_write.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/delete.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/gridfs/upload.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/insert_many.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/insert_one.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/replace_one.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/rewrap_many_datakey.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/result/update.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/search_index_model.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/search_index_view.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/test_util/client_helpers.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/test_util/client_helpers.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/test_util/export_for_testing.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/test_util/mock.hh (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/uri.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/validation_criteria.cpp (100%) rename src/mongocxx/{ => lib/mongocxx/v_noabi/mongocxx}/write_concern.cpp (100%) diff --git a/cmake/BsoncxxUtil.cmake b/cmake/BsoncxxUtil.cmake index 51dc26acc7..3e696d41d3 100644 --- a/cmake/BsoncxxUtil.cmake +++ b/cmake/BsoncxxUtil.cmake @@ -45,8 +45,9 @@ function(bsoncxx_add_library TARGET OUTPUT_NAME LINK_TYPE) target_include_directories( ${TARGET} PUBLIC - $ - $ + $ + $ + $ ) target_compile_definitions(${TARGET} PRIVATE ${libbson_definitions}) @@ -54,7 +55,7 @@ function(bsoncxx_add_library TARGET OUTPUT_NAME LINK_TYPE) BASE_NAME BSONCXX EXPORT_MACRO_NAME BSONCXX_API NO_EXPORT_MACRO_NAME BSONCXX_PRIVATE - EXPORT_FILE_NAME config/export.hpp + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/lib/bsoncxx/v_noabi/bsoncxx/config/export.hpp STATIC_DEFINE BSONCXX_STATIC ) endfunction(bsoncxx_add_library) diff --git a/cmake/MongocxxUtil.cmake b/cmake/MongocxxUtil.cmake index 457b1e8d89..7f280e02c8 100644 --- a/cmake/MongocxxUtil.cmake +++ b/cmake/MongocxxUtil.cmake @@ -33,9 +33,9 @@ function(mongocxx_add_library TARGET OUTPUT_NAME LINK_TYPE) target_include_directories( ${TARGET} PUBLIC - $ - $ - $ + $ + $ + $ ) target_compile_definitions(${TARGET} PRIVATE ${libmongoc_definitions}) @@ -43,7 +43,7 @@ function(mongocxx_add_library TARGET OUTPUT_NAME LINK_TYPE) BASE_NAME MONGOCXX EXPORT_MACRO_NAME MONGOCXX_API NO_EXPORT_MACRO_NAME MONGOCXX_PRIVATE - EXPORT_FILE_NAME config/export.hpp + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/lib/mongocxx/v_noabi/mongocxx/config/export.hpp STATIC_DEFINE MONGOCXX_STATIC ) endfunction(mongocxx_add_library) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt index fe39749cc5..455cc9bd86 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt @@ -142,26 +142,26 @@ else() endif() add_subdirectory(third_party) -add_subdirectory(config) +add_subdirectory(lib/bsoncxx/v_noabi/bsoncxx/config) set(bsoncxx_sources - array/element.cpp - array/value.cpp - array/view.cpp - builder/core.cpp - decimal128.cpp - document/element.cpp - document/value.cpp - document/view.cpp - exception/error_code.cpp - json.cpp - oid.cpp - private/itoa.cpp - string/view_or_value.cpp - types.cpp - types/bson_value/value.cpp - types/bson_value/view.cpp - validate.cpp + lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp + lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp + lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp + lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp + lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp + lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp + lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp + lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp + lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp + lib/bsoncxx/v_noabi/bsoncxx/json.cpp + lib/bsoncxx/v_noabi/bsoncxx/oid.cpp + lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp + lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp + lib/bsoncxx/v_noabi/bsoncxx/types.cpp + lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp + lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp + lib/bsoncxx/v_noabi/bsoncxx/validate.cpp ) # We define both the normal libraries and the testing-only library. The testing-only @@ -195,15 +195,15 @@ if(ENABLE_TESTS) endif() -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DESTINATION ${BSONCXX_HEADER_INSTALL_DIR} +install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev FILES_MATCHING PATTERN "*.hpp" ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/config/export.hpp + ${PROJECT_BINARY_DIR}/lib/bsoncxx/v_noabi/bsoncxx/config/export.hpp DESTINATION ${BSONCXX_HEADER_INSTALL_DIR}/bsoncxx/config COMPONENT dev ) @@ -233,90 +233,97 @@ if(ENABLE_TESTS) add_subdirectory(test) endif() -set_local_dist (src_bsoncxx_DIST_local +set_local_dist (src_bsoncxx_lib_v_noabi_DIST_local CMakeLists.txt - array/element.cpp - array/element.hpp - array/value.cpp - array/value.hpp - array/view.cpp - array/view.hpp - array/view_or_value.hpp - builder/list.hpp - builder/basic/array.hpp - builder/basic/document.hpp - builder/basic/helpers.hpp - builder/basic/impl.hpp - builder/basic/kvp.hpp - builder/basic/sub_array.hpp - builder/basic/sub_document.hpp - builder/concatenate.hpp - builder/core.cpp - builder/core.hpp - builder/stream/array.hpp - builder/stream/array_context.hpp - builder/stream/closed_context.hpp - builder/stream/document.hpp - builder/stream/helpers.hpp - builder/stream/key_context.hpp - builder/stream/single_context.hpp - builder/stream/value_context.hpp + lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp + lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp + lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp + lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp cmake/bsoncxx-config.cmake.in cmake/libbsoncxx-config.cmake.in cmake/libbsoncxx-static-config.cmake.in - decimal128.cpp - decimal128.hpp - document/element.cpp - document/element.hpp - document/value.cpp - document/value.hpp - document/view.cpp - document/view.hpp - document/view_or_value.hpp - enums/binary_sub_type.hpp - enums/type.hpp - exception/error_code.cpp - exception/error_code.hpp - exception/exception.hpp - json.cpp - json.hpp - oid.cpp - oid.hpp - private/b64_ntop.hh - private/helpers.hh - private/itoa.cpp - private/itoa.hh - private/libbson.hh - private/stack.hh - private/suppress_deprecation_warnings.hh - stdx/make_unique.hpp - stdx/optional.hpp - stdx/string_view.hpp - string/to_string.hpp - string/view_or_value.cpp - string/view_or_value.hpp - test_util/catch.hh - test_util/export_for_testing.hh - test_util/to_string.hh - types.cpp - types.hpp - types/value.hpp - types/private/convert.hh - types/bson_value/make_value.hpp - types/bson_value/private/value.hh - types/bson_value/value.cpp - types/bson_value/value.hpp - types/bson_value/view.cpp - types/bson_value/view.hpp - types/bson_value/view_or_value.hpp - util/functor.hpp - validate.cpp - validate.hpp - view_or_value.hpp + lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp + lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp + lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp + lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp + lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp + lib/bsoncxx/v_noabi/bsoncxx/json.cpp + lib/bsoncxx/v_noabi/bsoncxx/oid.cpp + lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh + lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh + lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp + lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh + lib/bsoncxx/v_noabi/bsoncxx/private/libbson.hh + lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh + lib/bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh + lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp + lib/bsoncxx/v_noabi/bsoncxx/test_util/catch.hh + lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh + lib/bsoncxx/v_noabi/bsoncxx/test_util/to_string.hh + lib/bsoncxx/v_noabi/bsoncxx/types.cpp + lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh + lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh + lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp + lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp + lib/bsoncxx/v_noabi/bsoncxx/validate.cpp +) + +set_local_dist (src_bsoncxx_include_v_noabi_DIST_local + include/bsoncxx/v_noabi/bsoncxx/array/element.hpp + include/bsoncxx/v_noabi/bsoncxx/array/value.hpp + include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp + include/bsoncxx/v_noabi/bsoncxx/array/view.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp + include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp + include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp + include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp + include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp + include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp + include/bsoncxx/v_noabi/bsoncxx/document/element.hpp + include/bsoncxx/v_noabi/bsoncxx/document/value.hpp + include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp + include/bsoncxx/v_noabi/bsoncxx/document/view.hpp + include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp + include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp + include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp + include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp + include/bsoncxx/v_noabi/bsoncxx/json.hpp + include/bsoncxx/v_noabi/bsoncxx/oid.hpp + include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp + include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp + include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp + include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp + include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp + include/bsoncxx/v_noabi/bsoncxx/types.hpp + include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp + include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp + include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp + include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp + include/bsoncxx/v_noabi/bsoncxx/types/value.hpp + include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp + include/bsoncxx/v_noabi/bsoncxx/validate.hpp + include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp ) set (src_bsoncxx_DIST - ${src_bsoncxx_DIST_local} + ${src_bsoncxx_lib_v_noabi_DIST_local} + ${src_bsoncxx_include_v_noabi_DIST_local} ${src_bsoncxx_config_DIST} ${src_bsoncxx_third_party_DIST} ${src_bsoncxx_test_DIST} diff --git a/src/bsoncxx/array/element.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp similarity index 100% rename from src/bsoncxx/array/element.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp diff --git a/src/bsoncxx/array/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp similarity index 100% rename from src/bsoncxx/array/value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp diff --git a/src/bsoncxx/array/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp similarity index 100% rename from src/bsoncxx/array/view.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp diff --git a/src/bsoncxx/array/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp similarity index 100% rename from src/bsoncxx/array/view_or_value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp diff --git a/src/bsoncxx/builder/basic/array.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp similarity index 100% rename from src/bsoncxx/builder/basic/array.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp diff --git a/src/bsoncxx/builder/basic/document.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp similarity index 100% rename from src/bsoncxx/builder/basic/document.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp diff --git a/src/bsoncxx/builder/basic/helpers.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp similarity index 100% rename from src/bsoncxx/builder/basic/helpers.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp diff --git a/src/bsoncxx/builder/basic/impl.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp similarity index 100% rename from src/bsoncxx/builder/basic/impl.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp diff --git a/src/bsoncxx/builder/basic/kvp.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp similarity index 100% rename from src/bsoncxx/builder/basic/kvp.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp diff --git a/src/bsoncxx/builder/basic/sub_array.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp similarity index 100% rename from src/bsoncxx/builder/basic/sub_array.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp diff --git a/src/bsoncxx/builder/basic/sub_document.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp similarity index 100% rename from src/bsoncxx/builder/basic/sub_document.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp diff --git a/src/bsoncxx/builder/concatenate.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp similarity index 100% rename from src/bsoncxx/builder/concatenate.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp diff --git a/src/bsoncxx/builder/core.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp similarity index 100% rename from src/bsoncxx/builder/core.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp diff --git a/src/bsoncxx/builder/list.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp similarity index 100% rename from src/bsoncxx/builder/list.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp diff --git a/src/bsoncxx/builder/stream/array.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp similarity index 100% rename from src/bsoncxx/builder/stream/array.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp diff --git a/src/bsoncxx/builder/stream/array_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp similarity index 100% rename from src/bsoncxx/builder/stream/array_context.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp diff --git a/src/bsoncxx/builder/stream/closed_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp similarity index 100% rename from src/bsoncxx/builder/stream/closed_context.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp diff --git a/src/bsoncxx/builder/stream/document.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp similarity index 100% rename from src/bsoncxx/builder/stream/document.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp diff --git a/src/bsoncxx/builder/stream/helpers.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp similarity index 100% rename from src/bsoncxx/builder/stream/helpers.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp diff --git a/src/bsoncxx/builder/stream/key_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp similarity index 100% rename from src/bsoncxx/builder/stream/key_context.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp diff --git a/src/bsoncxx/builder/stream/single_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp similarity index 100% rename from src/bsoncxx/builder/stream/single_context.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp diff --git a/src/bsoncxx/builder/stream/value_context.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp similarity index 100% rename from src/bsoncxx/builder/stream/value_context.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp diff --git a/src/bsoncxx/config/compiler.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp similarity index 100% rename from src/bsoncxx/config/compiler.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp diff --git a/src/bsoncxx/config/postlude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp similarity index 100% rename from src/bsoncxx/config/postlude.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp diff --git a/src/bsoncxx/config/prelude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp similarity index 100% rename from src/bsoncxx/config/prelude.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp diff --git a/src/bsoncxx/decimal128.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp similarity index 100% rename from src/bsoncxx/decimal128.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp diff --git a/src/bsoncxx/document/element.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp similarity index 100% rename from src/bsoncxx/document/element.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp diff --git a/src/bsoncxx/document/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp similarity index 100% rename from src/bsoncxx/document/value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp diff --git a/src/bsoncxx/document/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp similarity index 100% rename from src/bsoncxx/document/view.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp diff --git a/src/bsoncxx/document/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp similarity index 100% rename from src/bsoncxx/document/view_or_value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp diff --git a/src/bsoncxx/enums/binary_sub_type.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp similarity index 100% rename from src/bsoncxx/enums/binary_sub_type.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp diff --git a/src/bsoncxx/enums/type.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp similarity index 100% rename from src/bsoncxx/enums/type.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp diff --git a/src/bsoncxx/exception/error_code.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp similarity index 100% rename from src/bsoncxx/exception/error_code.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp diff --git a/src/bsoncxx/exception/exception.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp similarity index 100% rename from src/bsoncxx/exception/exception.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp diff --git a/src/bsoncxx/json.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/json.hpp similarity index 100% rename from src/bsoncxx/json.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/json.hpp diff --git a/src/bsoncxx/oid.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp similarity index 100% rename from src/bsoncxx/oid.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/oid.hpp diff --git a/src/bsoncxx/stdx/make_unique.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp similarity index 100% rename from src/bsoncxx/stdx/make_unique.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp diff --git a/src/bsoncxx/stdx/optional.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp similarity index 100% rename from src/bsoncxx/stdx/optional.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp diff --git a/src/bsoncxx/stdx/string_view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp similarity index 100% rename from src/bsoncxx/stdx/string_view.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp diff --git a/src/bsoncxx/string/to_string.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp similarity index 100% rename from src/bsoncxx/string/to_string.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp diff --git a/src/bsoncxx/string/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp similarity index 100% rename from src/bsoncxx/string/view_or_value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp diff --git a/src/bsoncxx/types.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp similarity index 100% rename from src/bsoncxx/types.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp diff --git a/src/bsoncxx/types/bson_value/make_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp similarity index 100% rename from src/bsoncxx/types/bson_value/make_value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp diff --git a/src/bsoncxx/types/bson_value/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp similarity index 100% rename from src/bsoncxx/types/bson_value/value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp diff --git a/src/bsoncxx/types/bson_value/view.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp similarity index 100% rename from src/bsoncxx/types/bson_value/view.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp diff --git a/src/bsoncxx/types/bson_value/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp similarity index 100% rename from src/bsoncxx/types/bson_value/view_or_value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp diff --git a/src/bsoncxx/types/value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp similarity index 100% rename from src/bsoncxx/types/value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp diff --git a/src/bsoncxx/util/functor.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp similarity index 100% rename from src/bsoncxx/util/functor.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp diff --git a/src/bsoncxx/validate.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/validate.hpp similarity index 100% rename from src/bsoncxx/validate.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/validate.hpp diff --git a/src/bsoncxx/view_or_value.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp similarity index 100% rename from src/bsoncxx/view_or_value.hpp rename to src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp diff --git a/src/bsoncxx/array/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp similarity index 100% rename from src/bsoncxx/array/element.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp diff --git a/src/bsoncxx/array/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp similarity index 100% rename from src/bsoncxx/array/value.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp diff --git a/src/bsoncxx/array/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp similarity index 100% rename from src/bsoncxx/array/view.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp diff --git a/src/bsoncxx/builder/core.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp similarity index 100% rename from src/bsoncxx/builder/core.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp diff --git a/src/bsoncxx/config/CMakeLists.txt b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/CMakeLists.txt similarity index 97% rename from src/bsoncxx/config/CMakeLists.txt rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/CMakeLists.txt index 582eb2406a..b730f1433f 100644 --- a/src/bsoncxx/config/CMakeLists.txt +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/CMakeLists.txt @@ -66,12 +66,9 @@ endif() set_dist_list (src_bsoncxx_config_DIST CMakeLists.txt - compiler.hpp config.hpp.in libbsoncxx-static.pc.in libbsoncxx.pc.in - postlude.hpp - prelude.hpp private/config.hh.in private/postlude.hh private/prelude.hh diff --git a/src/bsoncxx/config/config.hpp.in b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in similarity index 100% rename from src/bsoncxx/config/config.hpp.in rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/config.hpp.in diff --git a/src/bsoncxx/config/libbsoncxx-static.pc.in b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx-static.pc.in similarity index 100% rename from src/bsoncxx/config/libbsoncxx-static.pc.in rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx-static.pc.in diff --git a/src/bsoncxx/config/libbsoncxx.pc.in b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx.pc.in similarity index 100% rename from src/bsoncxx/config/libbsoncxx.pc.in rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx.pc.in diff --git a/src/bsoncxx/config/private/config.hh.in b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in similarity index 100% rename from src/bsoncxx/config/private/config.hh.in rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/config.hh.in diff --git a/src/bsoncxx/config/private/postlude.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh similarity index 100% rename from src/bsoncxx/config/private/postlude.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/postlude.hh diff --git a/src/bsoncxx/config/private/prelude.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh similarity index 100% rename from src/bsoncxx/config/private/prelude.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/private/prelude.hh diff --git a/src/bsoncxx/config/version.hpp.in b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/version.hpp.in similarity index 100% rename from src/bsoncxx/config/version.hpp.in rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/version.hpp.in diff --git a/src/bsoncxx/decimal128.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp similarity index 100% rename from src/bsoncxx/decimal128.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp diff --git a/src/bsoncxx/document/element.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp similarity index 100% rename from src/bsoncxx/document/element.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp diff --git a/src/bsoncxx/document/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp similarity index 100% rename from src/bsoncxx/document/value.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp diff --git a/src/bsoncxx/document/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp similarity index 100% rename from src/bsoncxx/document/view.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/view.cpp diff --git a/src/bsoncxx/exception/error_code.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp similarity index 100% rename from src/bsoncxx/exception/error_code.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/exception/error_code.cpp diff --git a/src/bsoncxx/json.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp similarity index 100% rename from src/bsoncxx/json.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/json.cpp diff --git a/src/bsoncxx/oid.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp similarity index 100% rename from src/bsoncxx/oid.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/oid.cpp diff --git a/src/bsoncxx/private/b64_ntop.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh similarity index 100% rename from src/bsoncxx/private/b64_ntop.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/b64_ntop.hh diff --git a/src/bsoncxx/private/helpers.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh similarity index 100% rename from src/bsoncxx/private/helpers.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/helpers.hh diff --git a/src/bsoncxx/private/itoa.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp similarity index 100% rename from src/bsoncxx/private/itoa.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.cpp diff --git a/src/bsoncxx/private/itoa.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh similarity index 100% rename from src/bsoncxx/private/itoa.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/itoa.hh diff --git a/src/bsoncxx/private/libbson.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/libbson.hh similarity index 100% rename from src/bsoncxx/private/libbson.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/libbson.hh diff --git a/src/bsoncxx/private/stack.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh similarity index 100% rename from src/bsoncxx/private/stack.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/stack.hh diff --git a/src/bsoncxx/private/suppress_deprecation_warnings.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh similarity index 100% rename from src/bsoncxx/private/suppress_deprecation_warnings.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/private/suppress_deprecation_warnings.hh diff --git a/src/bsoncxx/string/view_or_value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp similarity index 100% rename from src/bsoncxx/string/view_or_value.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/string/view_or_value.cpp diff --git a/src/bsoncxx/test_util/catch.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/catch.hh similarity index 100% rename from src/bsoncxx/test_util/catch.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/catch.hh diff --git a/src/bsoncxx/test_util/export_for_testing.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh similarity index 100% rename from src/bsoncxx/test_util/export_for_testing.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh diff --git a/src/bsoncxx/test_util/to_string.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/to_string.hh similarity index 100% rename from src/bsoncxx/test_util/to_string.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/to_string.hh diff --git a/src/bsoncxx/types.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp similarity index 100% rename from src/bsoncxx/types.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types.cpp diff --git a/src/bsoncxx/types/bson_value/private/value.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh similarity index 100% rename from src/bsoncxx/types/bson_value/private/value.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/private/value.hh diff --git a/src/bsoncxx/types/bson_value/value.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp similarity index 100% rename from src/bsoncxx/types/bson_value/value.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp diff --git a/src/bsoncxx/types/bson_value/view.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp similarity index 100% rename from src/bsoncxx/types/bson_value/view.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp diff --git a/src/bsoncxx/types/private/convert.hh b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh similarity index 100% rename from src/bsoncxx/types/private/convert.hh rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/private/convert.hh diff --git a/src/bsoncxx/validate.cpp b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp similarity index 100% rename from src/bsoncxx/validate.cpp rename to src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt index 5f95d74fac..709ee3576e 100644 --- a/src/mongocxx/CMakeLists.txt +++ b/src/mongocxx/CMakeLists.txt @@ -73,102 +73,102 @@ else() endif() endif() -add_subdirectory(config) +add_subdirectory(lib/mongocxx/v_noabi/mongocxx/config) set(mongocxx_sources - bulk_write.cpp - client.cpp - client_encryption.cpp - client_session.cpp - change_stream.cpp - collection.cpp - cursor.cpp - database.cpp - events/command_failed_event.cpp - events/command_started_event.cpp - events/command_succeeded_event.cpp - events/heartbeat_failed_event.cpp - events/heartbeat_started_event.cpp - events/heartbeat_succeeded_event.cpp - events/server_changed_event.cpp - events/server_closed_event.cpp - events/server_description.cpp - events/server_opening_event.cpp - events/topology_changed_event.cpp - events/topology_closed_event.cpp - events/topology_description.cpp - events/topology_opening_event.cpp - exception/error_code.cpp - exception/operation_exception.cpp - exception/server_error_code.cpp - gridfs/bucket.cpp - gridfs/downloader.cpp - gridfs/uploader.cpp - hint.cpp - index_model.cpp - index_view.cpp - instance.cpp - logger.cpp - model/delete_many.cpp - model/delete_one.cpp - model/insert_one.cpp - model/replace_one.cpp - model/update_many.cpp - model/update_one.cpp - model/write.cpp - options/aggregate.cpp - options/apm.cpp - options/auto_encryption.cpp - options/bulk_write.cpp - options/change_stream.cpp - options/client.cpp - options/client_encryption.cpp - options/client_session.cpp - options/count.cpp - options/estimated_document_count.cpp - options/create_collection.cpp - options/data_key.cpp - options/delete.cpp - options/distinct.cpp - options/encrypt.cpp - options/find_one_and_delete.cpp - options/find_one_and_replace.cpp - options/find_one_and_update.cpp - options/find.cpp - options/gridfs/bucket.cpp - options/gridfs/upload.cpp - options/index.cpp - options/index_view.cpp - options/insert.cpp - options/pool.cpp - options/range.cpp - options/replace.cpp - options/rewrap_many_datakey.cpp - options/server_api.cpp - options/tls.cpp - options/transaction.cpp - options/update.cpp - pipeline.cpp - pool.cpp - private/conversions.cpp - private/libbson.cpp - private/libmongoc.cpp - private/numeric_casting.cpp - read_concern.cpp - read_preference.cpp - result/bulk_write.cpp - result/delete.cpp - result/gridfs/upload.cpp - result/insert_many.cpp - result/insert_one.cpp - result/replace_one.cpp - result/rewrap_many_datakey.cpp - result/update.cpp - search_index_model.cpp - search_index_view.cpp - uri.cpp - validation_criteria.cpp - write_concern.cpp + lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp + lib/mongocxx/v_noabi/mongocxx/client.cpp + lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp + lib/mongocxx/v_noabi/mongocxx/client_session.cpp + lib/mongocxx/v_noabi/mongocxx/change_stream.cpp + lib/mongocxx/v_noabi/mongocxx/collection.cpp + lib/mongocxx/v_noabi/mongocxx/cursor.cpp + lib/mongocxx/v_noabi/mongocxx/database.cpp + lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp + lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp + lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp + lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp + lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp + lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp + lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp + lib/mongocxx/v_noabi/mongocxx/hint.cpp + lib/mongocxx/v_noabi/mongocxx/index_model.cpp + lib/mongocxx/v_noabi/mongocxx/index_view.cpp + lib/mongocxx/v_noabi/mongocxx/instance.cpp + lib/mongocxx/v_noabi/mongocxx/logger.cpp + lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp + lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp + lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/write.cpp + lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp + lib/mongocxx/v_noabi/mongocxx/options/apm.cpp + lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp + lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp + lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp + lib/mongocxx/v_noabi/mongocxx/options/client.cpp + lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp + lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp + lib/mongocxx/v_noabi/mongocxx/options/count.cpp + lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp + lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp + lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp + lib/mongocxx/v_noabi/mongocxx/options/delete.cpp + lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp + lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp + lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp + lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp + lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp + lib/mongocxx/v_noabi/mongocxx/options/find.cpp + lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp + lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp + lib/mongocxx/v_noabi/mongocxx/options/index.cpp + lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp + lib/mongocxx/v_noabi/mongocxx/options/insert.cpp + lib/mongocxx/v_noabi/mongocxx/options/pool.cpp + lib/mongocxx/v_noabi/mongocxx/options/range.cpp + lib/mongocxx/v_noabi/mongocxx/options/replace.cpp + lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp + lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp + lib/mongocxx/v_noabi/mongocxx/options/tls.cpp + lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp + lib/mongocxx/v_noabi/mongocxx/options/update.cpp + lib/mongocxx/v_noabi/mongocxx/pipeline.cpp + lib/mongocxx/v_noabi/mongocxx/pool.cpp + lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp + lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp + lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp + lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp + lib/mongocxx/v_noabi/mongocxx/read_concern.cpp + lib/mongocxx/v_noabi/mongocxx/read_preference.cpp + lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp + lib/mongocxx/v_noabi/mongocxx/result/delete.cpp + lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp + lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp + lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp + lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp + lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp + lib/mongocxx/v_noabi/mongocxx/result/update.cpp + lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp + lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp + lib/mongocxx/v_noabi/mongocxx/uri.cpp + lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp + lib/mongocxx/v_noabi/mongocxx/write_concern.cpp ) # We define both the normal libraries and the testing-only library. The testing-only @@ -208,15 +208,15 @@ if(ENABLE_TESTS) endif() -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DESTINATION ${MONGOCXX_HEADER_INSTALL_DIR} +install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev FILES_MATCHING PATTERN "*.hpp" ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/config/export.hpp + ${PROJECT_BINARY_DIR}/lib/mongocxx/v_noabi/mongocxx/config/export.hpp DESTINATION ${MONGOCXX_HEADER_INSTALL_DIR}/mongocxx/config COMPONENT dev ) @@ -243,243 +243,250 @@ if(ENABLE_TESTS) add_subdirectory(test) endif() -set_local_dist (src_mongocxx_DIST_local +set_local_dist (src_mongocxx_lib_v_noabi_DIST_local CMakeLists.txt - bulk_write.cpp - bulk_write.hpp - change_stream.cpp - change_stream.hpp - client.cpp - client.hpp - client_encryption.cpp - client_encryption.hpp - client_session.cpp - client_session.hpp + lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp + lib/mongocxx/v_noabi/mongocxx/change_stream.cpp + lib/mongocxx/v_noabi/mongocxx/client.cpp + lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp + lib/mongocxx/v_noabi/mongocxx/client_session.cpp cmake/mongocxx-config.cmake.in cmake/libmongocxx-config.cmake.in cmake/libmongocxx-static-config.cmake.in - collection.cpp - collection.hpp - cursor.cpp - cursor.hpp - database.cpp - database.hpp - events/command_failed_event.cpp - events/command_failed_event.hpp - events/command_started_event.cpp - events/command_started_event.hpp - events/command_succeeded_event.cpp - events/command_succeeded_event.hpp - events/heartbeat_failed_event.cpp - events/heartbeat_failed_event.hpp - events/heartbeat_started_event.cpp - events/heartbeat_started_event.hpp - events/heartbeat_succeeded_event.cpp - events/heartbeat_succeeded_event.hpp - events/server_changed_event.cpp - events/server_changed_event.hpp - events/server_closed_event.cpp - events/server_closed_event.hpp - events/server_description.cpp - events/server_description.hpp - events/server_opening_event.cpp - events/server_opening_event.hpp - events/topology_changed_event.cpp - events/topology_changed_event.hpp - events/topology_closed_event.cpp - events/topology_closed_event.hpp - events/topology_description.cpp - events/topology_description.hpp - events/topology_opening_event.cpp - events/topology_opening_event.hpp - exception/authentication_exception.hpp - exception/bulk_write_exception.hpp - exception/error_code.cpp - exception/error_code.hpp - exception/exception.hpp - exception/gridfs_exception.hpp - exception/logic_error.hpp - exception/operation_exception.cpp - exception/operation_exception.hpp - exception/private/mongoc_error.hh - exception/query_exception.hpp - exception/server_error_code.cpp - exception/server_error_code.hpp - exception/write_exception.hpp - gridfs/bucket.cpp - gridfs/bucket.hpp - gridfs/downloader.cpp - gridfs/downloader.hpp - gridfs/private/bucket.hh - gridfs/private/downloader.hh - gridfs/private/uploader.hh - gridfs/uploader.cpp - gridfs/uploader.hpp - hint.cpp - hint.hpp - index_model.cpp - index_model.hpp - index_view.cpp - index_view.hpp - instance.cpp - instance.hpp - logger.cpp - logger.hpp - model/delete_many.cpp - model/delete_many.hpp - model/delete_one.cpp - model/delete_one.hpp - model/insert_one.cpp - model/insert_one.hpp - model/replace_one.cpp - model/replace_one.hpp - model/update_many.cpp - model/update_many.hpp - model/update_one.cpp - model/update_one.hpp - model/write.cpp - model/write.hpp - options/aggregate.cpp - options/aggregate.hpp - options/apm.cpp - options/apm.hpp - options/auto_encryption.cpp - options/auto_encryption.hpp - options/bulk_write.cpp - options/bulk_write.hpp - options/change_stream.cpp - options/change_stream.hpp - options/client.cpp - options/client.hpp - options/client_encryption.cpp - options/client_encryption.hpp - options/client_session.cpp - options/client_session.hpp - options/count.cpp - options/count.hpp - options/create_collection.cpp - options/create_collection.hpp - options/data_key.cpp - options/data_key.hpp - options/delete.cpp - options/delete.hpp - options/distinct.cpp - options/distinct.hpp - options/encrypt.cpp - options/encrypt.hpp - options/estimated_document_count.cpp - options/estimated_document_count.hpp - options/find.cpp - options/find.hpp - options/find_one_and_delete.cpp - options/find_one_and_delete.hpp - options/find_one_and_replace.cpp - options/find_one_and_replace.hpp - options/find_one_and_update.cpp - options/find_one_and_update.hpp - options/find_one_common_options.hpp - options/gridfs/bucket.cpp - options/gridfs/bucket.hpp - options/gridfs/upload.cpp - options/gridfs/upload.hpp - options/index.cpp - options/index.hpp - options/index_view.cpp - options/index_view.hpp - options/insert.cpp - options/insert.hpp - options/pool.cpp - options/pool.hpp - options/private/apm.hh - options/private/server_api.hh - options/private/ssl.hh - options/private/transaction.hh - options/range.cpp - options/range.hpp - options/replace.cpp - options/replace.hpp - options/rewrap_many_datakey.cpp - options/rewrap_many_datakey.hpp - options/server_api.cpp - options/server_api.hpp - options/ssl.hpp - options/tls.cpp - options/tls.hpp - options/transaction.cpp - options/transaction.hpp - options/update.cpp - options/update.hpp - pipeline.cpp - pipeline.hpp - pool.cpp - pool.hpp - private/append_aggregate_options.hh - private/bulk_write.hh - private/change_stream.hh - private/client.hh - private/client_encryption.hh - private/client_session.hh - private/collection.hh - private/conversions.cpp - private/conversions.hh - private/cursor.hh - private/database.hh - private/index_view.hh - private/libbson.cpp - private/libbson.hh - private/libmongoc.cpp - private/libmongoc.hh - private/libmongoc_symbols.hh - private/numeric_casting.cpp - private/numeric_casting.hh - private/pipeline.hh - private/pool.hh - private/read_concern.hh - private/read_preference.hh - private/search_index_model.hh - private/search_index_view.hh - private/uri.hh - private/write_concern.hh - read_concern.cpp - read_concern.hpp - read_preference.cpp - read_preference.hpp - result/bulk_write.cpp - result/bulk_write.hpp - result/delete.cpp - result/delete.hpp - result/gridfs/upload.cpp - result/gridfs/upload.hpp - result/insert_many.cpp - result/insert_many.hpp - result/insert_one.cpp - result/insert_one.hpp - result/replace_one.cpp - result/replace_one.hpp - result/rewrap_many_datakey.cpp - result/rewrap_many_datakey.hpp - result/update.cpp - result/update.hpp - search_index_model.cpp - search_index_model.hpp - search_index_view.cpp - search_index_view.hpp - stdx.hpp - test_util/client_helpers.cpp - test_util/client_helpers.hh - test_util/export_for_testing.hh - test_util/mock.hh - uri.cpp - uri.hpp - validation_criteria.cpp - validation_criteria.hpp - write_concern.cpp - write_concern.hpp - write_type.hpp + lib/mongocxx/v_noabi/mongocxx/collection.cpp + lib/mongocxx/v_noabi/mongocxx/cursor.cpp + lib/mongocxx/v_noabi/mongocxx/database.cpp + lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp + lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp + lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp + lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp + lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp + lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh + lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp + lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp + lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp + lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh + lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh + lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh + lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp + lib/mongocxx/v_noabi/mongocxx/hint.cpp + lib/mongocxx/v_noabi/mongocxx/index_model.cpp + lib/mongocxx/v_noabi/mongocxx/index_view.cpp + lib/mongocxx/v_noabi/mongocxx/instance.cpp + lib/mongocxx/v_noabi/mongocxx/logger.cpp + lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp + lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp + lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp + lib/mongocxx/v_noabi/mongocxx/model/write.cpp + lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp + lib/mongocxx/v_noabi/mongocxx/options/apm.cpp + lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp + lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp + lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp + lib/mongocxx/v_noabi/mongocxx/options/client.cpp + lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp + lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp + lib/mongocxx/v_noabi/mongocxx/options/count.cpp + lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp + lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp + lib/mongocxx/v_noabi/mongocxx/options/delete.cpp + lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp + lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp + lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp + lib/mongocxx/v_noabi/mongocxx/options/find.cpp + lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp + lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp + lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp + lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp + lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp + lib/mongocxx/v_noabi/mongocxx/options/index.cpp + lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp + lib/mongocxx/v_noabi/mongocxx/options/insert.cpp + lib/mongocxx/v_noabi/mongocxx/options/pool.cpp + lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh + lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh + lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh + lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh + lib/mongocxx/v_noabi/mongocxx/options/range.cpp + lib/mongocxx/v_noabi/mongocxx/options/replace.cpp + lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp + lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp + lib/mongocxx/v_noabi/mongocxx/options/tls.cpp + lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp + lib/mongocxx/v_noabi/mongocxx/options/update.cpp + lib/mongocxx/v_noabi/mongocxx/pipeline.cpp + lib/mongocxx/v_noabi/mongocxx/pool.cpp + lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh + lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh + lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh + lib/mongocxx/v_noabi/mongocxx/private/client.hh + lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh + lib/mongocxx/v_noabi/mongocxx/private/client_session.hh + lib/mongocxx/v_noabi/mongocxx/private/collection.hh + lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp + lib/mongocxx/v_noabi/mongocxx/private/conversions.hh + lib/mongocxx/v_noabi/mongocxx/private/cursor.hh + lib/mongocxx/v_noabi/mongocxx/private/database.hh + lib/mongocxx/v_noabi/mongocxx/private/index_view.hh + lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp + lib/mongocxx/v_noabi/mongocxx/private/libbson.hh + lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp + lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh + lib/mongocxx/v_noabi/mongocxx/private/libmongoc_symbols.hh + lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp + lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh + lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh + lib/mongocxx/v_noabi/mongocxx/private/pool.hh + lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh + lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh + lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh + lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh + lib/mongocxx/v_noabi/mongocxx/private/uri.hh + lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh + lib/mongocxx/v_noabi/mongocxx/read_concern.cpp + lib/mongocxx/v_noabi/mongocxx/read_preference.cpp + lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp + lib/mongocxx/v_noabi/mongocxx/result/delete.cpp + lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp + lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp + lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp + lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp + lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp + lib/mongocxx/v_noabi/mongocxx/result/update.cpp + lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp + lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp + lib/mongocxx/v_noabi/mongocxx/test_util/client_helpers.cpp + lib/mongocxx/v_noabi/mongocxx/test_util/client_helpers.hh + lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh + lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh + lib/mongocxx/v_noabi/mongocxx/uri.cpp + lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp + lib/mongocxx/v_noabi/mongocxx/write_concern.cpp +) + +set_local_dist (src_mongocxx_include_v_noabi_DIST_local + include/mongocxx/v_noabi/mongocxx/bulk_write.hpp + include/mongocxx/v_noabi/mongocxx/change_stream.hpp + include/mongocxx/v_noabi/mongocxx/client_encryption.hpp + include/mongocxx/v_noabi/mongocxx/client_session.hpp + include/mongocxx/v_noabi/mongocxx/client.hpp + include/mongocxx/v_noabi/mongocxx/collection.hpp + include/mongocxx/v_noabi/mongocxx/config/compiler.hpp + include/mongocxx/v_noabi/mongocxx/config/postlude.hpp + include/mongocxx/v_noabi/mongocxx/config/prelude.hpp + include/mongocxx/v_noabi/mongocxx/cursor.hpp + include/mongocxx/v_noabi/mongocxx/database.hpp + include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp + include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp + include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp + include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp + include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp + include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp + include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp + include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp + include/mongocxx/v_noabi/mongocxx/events/server_description.hpp + include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp + include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp + include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp + include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp + include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp + include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp + include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp + include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp + include/mongocxx/v_noabi/mongocxx/exception/exception.hpp + include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp + include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp + include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp + include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp + include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp + include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp + include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp + include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp + include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp + include/mongocxx/v_noabi/mongocxx/hint.hpp + include/mongocxx/v_noabi/mongocxx/index_model.hpp + include/mongocxx/v_noabi/mongocxx/index_view.hpp + include/mongocxx/v_noabi/mongocxx/instance.hpp + include/mongocxx/v_noabi/mongocxx/logger.hpp + include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp + include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp + include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp + include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp + include/mongocxx/v_noabi/mongocxx/model/update_many.hpp + include/mongocxx/v_noabi/mongocxx/model/update_one.hpp + include/mongocxx/v_noabi/mongocxx/model/write.hpp + include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp + include/mongocxx/v_noabi/mongocxx/options/apm.hpp + include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp + include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp + include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp + include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp + include/mongocxx/v_noabi/mongocxx/options/client_session.hpp + include/mongocxx/v_noabi/mongocxx/options/client.hpp + include/mongocxx/v_noabi/mongocxx/options/count.hpp + include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp + include/mongocxx/v_noabi/mongocxx/options/data_key.hpp + include/mongocxx/v_noabi/mongocxx/options/delete.hpp + include/mongocxx/v_noabi/mongocxx/options/distinct.hpp + include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp + include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp + include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp + include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp + include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp + include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp + include/mongocxx/v_noabi/mongocxx/options/find.hpp + include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp + include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp + include/mongocxx/v_noabi/mongocxx/options/index_view.hpp + include/mongocxx/v_noabi/mongocxx/options/index.hpp + include/mongocxx/v_noabi/mongocxx/options/insert.hpp + include/mongocxx/v_noabi/mongocxx/options/pool.hpp + include/mongocxx/v_noabi/mongocxx/options/range.hpp + include/mongocxx/v_noabi/mongocxx/options/replace.hpp + include/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.hpp + include/mongocxx/v_noabi/mongocxx/options/server_api.hpp + include/mongocxx/v_noabi/mongocxx/options/ssl.hpp + include/mongocxx/v_noabi/mongocxx/options/tls.hpp + include/mongocxx/v_noabi/mongocxx/options/transaction.hpp + include/mongocxx/v_noabi/mongocxx/options/update.hpp + include/mongocxx/v_noabi/mongocxx/pipeline.hpp + include/mongocxx/v_noabi/mongocxx/pool.hpp + include/mongocxx/v_noabi/mongocxx/read_concern.hpp + include/mongocxx/v_noabi/mongocxx/read_preference.hpp + include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp + include/mongocxx/v_noabi/mongocxx/result/delete.hpp + include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp + include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp + include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp + include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp + include/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.hpp + include/mongocxx/v_noabi/mongocxx/result/update.hpp + include/mongocxx/v_noabi/mongocxx/search_index_model.hpp + include/mongocxx/v_noabi/mongocxx/search_index_view.hpp + include/mongocxx/v_noabi/mongocxx/stdx.hpp + include/mongocxx/v_noabi/mongocxx/uri.hpp + include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp + include/mongocxx/v_noabi/mongocxx/write_concern.hpp + include/mongocxx/v_noabi/mongocxx/write_type.hpp ) set (src_mongocxx_DIST - ${src_mongocxx_DIST_local} + ${src_mongocxx_lib_v_noabi_DIST_local} + ${src_mongocxx_include_v_noabi_DIST_local} ${src_mongocxx_config_DIST} ${src_mongocxx_test_DIST} PARENT_SCOPE diff --git a/src/mongocxx/bulk_write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp similarity index 100% rename from src/mongocxx/bulk_write.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp diff --git a/src/mongocxx/change_stream.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/change_stream.hpp similarity index 100% rename from src/mongocxx/change_stream.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/change_stream.hpp diff --git a/src/mongocxx/client.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client.hpp similarity index 100% rename from src/mongocxx/client.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/client.hpp diff --git a/src/mongocxx/client_encryption.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp similarity index 100% rename from src/mongocxx/client_encryption.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp diff --git a/src/mongocxx/client_session.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_session.hpp similarity index 100% rename from src/mongocxx/client_session.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/client_session.hpp diff --git a/src/mongocxx/collection.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/collection.hpp similarity index 100% rename from src/mongocxx/collection.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/collection.hpp diff --git a/src/mongocxx/config/compiler.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp similarity index 100% rename from src/mongocxx/config/compiler.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp diff --git a/src/mongocxx/config/postlude.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp similarity index 100% rename from src/mongocxx/config/postlude.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp diff --git a/src/mongocxx/config/prelude.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp similarity index 100% rename from src/mongocxx/config/prelude.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp diff --git a/src/mongocxx/cursor.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/cursor.hpp similarity index 100% rename from src/mongocxx/cursor.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/cursor.hpp diff --git a/src/mongocxx/database.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/database.hpp similarity index 100% rename from src/mongocxx/database.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/database.hpp diff --git a/src/mongocxx/events/command_failed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp similarity index 100% rename from src/mongocxx/events/command_failed_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp diff --git a/src/mongocxx/events/command_started_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp similarity index 100% rename from src/mongocxx/events/command_started_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp diff --git a/src/mongocxx/events/command_succeeded_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp similarity index 100% rename from src/mongocxx/events/command_succeeded_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp diff --git a/src/mongocxx/events/heartbeat_failed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp similarity index 100% rename from src/mongocxx/events/heartbeat_failed_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp diff --git a/src/mongocxx/events/heartbeat_started_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp similarity index 100% rename from src/mongocxx/events/heartbeat_started_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp diff --git a/src/mongocxx/events/heartbeat_succeeded_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp similarity index 100% rename from src/mongocxx/events/heartbeat_succeeded_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp diff --git a/src/mongocxx/events/server_changed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp similarity index 100% rename from src/mongocxx/events/server_changed_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp diff --git a/src/mongocxx/events/server_closed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp similarity index 100% rename from src/mongocxx/events/server_closed_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp diff --git a/src/mongocxx/events/server_description.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp similarity index 100% rename from src/mongocxx/events/server_description.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp diff --git a/src/mongocxx/events/server_opening_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp similarity index 100% rename from src/mongocxx/events/server_opening_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp diff --git a/src/mongocxx/events/topology_changed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp similarity index 100% rename from src/mongocxx/events/topology_changed_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp diff --git a/src/mongocxx/events/topology_closed_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp similarity index 100% rename from src/mongocxx/events/topology_closed_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp diff --git a/src/mongocxx/events/topology_description.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp similarity index 100% rename from src/mongocxx/events/topology_description.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp diff --git a/src/mongocxx/events/topology_opening_event.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp similarity index 100% rename from src/mongocxx/events/topology_opening_event.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp diff --git a/src/mongocxx/exception/authentication_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp similarity index 100% rename from src/mongocxx/exception/authentication_exception.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp diff --git a/src/mongocxx/exception/bulk_write_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp similarity index 100% rename from src/mongocxx/exception/bulk_write_exception.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp diff --git a/src/mongocxx/exception/error_code.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp similarity index 100% rename from src/mongocxx/exception/error_code.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp diff --git a/src/mongocxx/exception/exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp similarity index 100% rename from src/mongocxx/exception/exception.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp diff --git a/src/mongocxx/exception/gridfs_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp similarity index 100% rename from src/mongocxx/exception/gridfs_exception.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp diff --git a/src/mongocxx/exception/logic_error.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp similarity index 100% rename from src/mongocxx/exception/logic_error.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp diff --git a/src/mongocxx/exception/operation_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp similarity index 100% rename from src/mongocxx/exception/operation_exception.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp diff --git a/src/mongocxx/exception/query_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp similarity index 100% rename from src/mongocxx/exception/query_exception.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp diff --git a/src/mongocxx/exception/server_error_code.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp similarity index 100% rename from src/mongocxx/exception/server_error_code.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp diff --git a/src/mongocxx/exception/write_exception.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp similarity index 100% rename from src/mongocxx/exception/write_exception.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp diff --git a/src/mongocxx/gridfs/bucket.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp similarity index 100% rename from src/mongocxx/gridfs/bucket.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp diff --git a/src/mongocxx/gridfs/downloader.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp similarity index 100% rename from src/mongocxx/gridfs/downloader.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp diff --git a/src/mongocxx/gridfs/uploader.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp similarity index 100% rename from src/mongocxx/gridfs/uploader.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp diff --git a/src/mongocxx/hint.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/hint.hpp similarity index 100% rename from src/mongocxx/hint.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/hint.hpp diff --git a/src/mongocxx/index_model.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_model.hpp similarity index 100% rename from src/mongocxx/index_model.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_model.hpp diff --git a/src/mongocxx/index_view.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_view.hpp similarity index 100% rename from src/mongocxx/index_view.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/index_view.hpp diff --git a/src/mongocxx/instance.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp similarity index 100% rename from src/mongocxx/instance.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/instance.hpp diff --git a/src/mongocxx/logger.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp similarity index 100% rename from src/mongocxx/logger.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/logger.hpp diff --git a/src/mongocxx/model/delete_many.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp similarity index 100% rename from src/mongocxx/model/delete_many.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp diff --git a/src/mongocxx/model/delete_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp similarity index 100% rename from src/mongocxx/model/delete_one.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp diff --git a/src/mongocxx/model/insert_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp similarity index 100% rename from src/mongocxx/model/insert_one.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp diff --git a/src/mongocxx/model/replace_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp similarity index 100% rename from src/mongocxx/model/replace_one.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp diff --git a/src/mongocxx/model/update_many.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp similarity index 100% rename from src/mongocxx/model/update_many.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp diff --git a/src/mongocxx/model/update_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp similarity index 100% rename from src/mongocxx/model/update_one.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp diff --git a/src/mongocxx/model/write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/write.hpp similarity index 100% rename from src/mongocxx/model/write.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/model/write.hpp diff --git a/src/mongocxx/options/aggregate.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp similarity index 100% rename from src/mongocxx/options/aggregate.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp diff --git a/src/mongocxx/options/apm.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/apm.hpp similarity index 100% rename from src/mongocxx/options/apm.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/apm.hpp diff --git a/src/mongocxx/options/auto_encryption.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp similarity index 100% rename from src/mongocxx/options/auto_encryption.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp diff --git a/src/mongocxx/options/bulk_write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp similarity index 100% rename from src/mongocxx/options/bulk_write.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp diff --git a/src/mongocxx/options/change_stream.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp similarity index 100% rename from src/mongocxx/options/change_stream.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp diff --git a/src/mongocxx/options/client.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client.hpp similarity index 100% rename from src/mongocxx/options/client.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client.hpp diff --git a/src/mongocxx/options/client_encryption.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp similarity index 100% rename from src/mongocxx/options/client_encryption.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp diff --git a/src/mongocxx/options/client_session.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp similarity index 100% rename from src/mongocxx/options/client_session.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp diff --git a/src/mongocxx/options/count.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/count.hpp similarity index 100% rename from src/mongocxx/options/count.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/count.hpp diff --git a/src/mongocxx/options/create_collection.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp similarity index 100% rename from src/mongocxx/options/create_collection.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp diff --git a/src/mongocxx/options/data_key.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp similarity index 100% rename from src/mongocxx/options/data_key.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp diff --git a/src/mongocxx/options/delete.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/delete.hpp similarity index 100% rename from src/mongocxx/options/delete.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/delete.hpp diff --git a/src/mongocxx/options/distinct.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp similarity index 100% rename from src/mongocxx/options/distinct.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp diff --git a/src/mongocxx/options/encrypt.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp similarity index 100% rename from src/mongocxx/options/encrypt.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp diff --git a/src/mongocxx/options/estimated_document_count.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp similarity index 100% rename from src/mongocxx/options/estimated_document_count.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp diff --git a/src/mongocxx/options/find.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find.hpp similarity index 100% rename from src/mongocxx/options/find.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find.hpp diff --git a/src/mongocxx/options/find_one_and_delete.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp similarity index 100% rename from src/mongocxx/options/find_one_and_delete.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp diff --git a/src/mongocxx/options/find_one_and_replace.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp similarity index 100% rename from src/mongocxx/options/find_one_and_replace.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp diff --git a/src/mongocxx/options/find_one_and_update.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp similarity index 100% rename from src/mongocxx/options/find_one_and_update.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp diff --git a/src/mongocxx/options/find_one_common_options.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp similarity index 100% rename from src/mongocxx/options/find_one_common_options.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp diff --git a/src/mongocxx/options/gridfs/bucket.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp similarity index 100% rename from src/mongocxx/options/gridfs/bucket.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp diff --git a/src/mongocxx/options/gridfs/upload.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp similarity index 100% rename from src/mongocxx/options/gridfs/upload.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp diff --git a/src/mongocxx/options/index.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index.hpp similarity index 100% rename from src/mongocxx/options/index.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index.hpp diff --git a/src/mongocxx/options/index_view.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp similarity index 100% rename from src/mongocxx/options/index_view.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp diff --git a/src/mongocxx/options/insert.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/insert.hpp similarity index 100% rename from src/mongocxx/options/insert.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/insert.hpp diff --git a/src/mongocxx/options/pool.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/pool.hpp similarity index 100% rename from src/mongocxx/options/pool.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/pool.hpp diff --git a/src/mongocxx/options/range.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/range.hpp similarity index 100% rename from src/mongocxx/options/range.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/range.hpp diff --git a/src/mongocxx/options/replace.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/replace.hpp similarity index 100% rename from src/mongocxx/options/replace.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/replace.hpp diff --git a/src/mongocxx/options/rewrap_many_datakey.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.hpp similarity index 100% rename from src/mongocxx/options/rewrap_many_datakey.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.hpp diff --git a/src/mongocxx/options/server_api.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp similarity index 100% rename from src/mongocxx/options/server_api.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp diff --git a/src/mongocxx/options/ssl.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp similarity index 100% rename from src/mongocxx/options/ssl.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp diff --git a/src/mongocxx/options/tls.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/tls.hpp similarity index 100% rename from src/mongocxx/options/tls.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/tls.hpp diff --git a/src/mongocxx/options/transaction.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp similarity index 100% rename from src/mongocxx/options/transaction.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp diff --git a/src/mongocxx/options/update.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/update.hpp similarity index 100% rename from src/mongocxx/options/update.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/update.hpp diff --git a/src/mongocxx/pipeline.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pipeline.hpp similarity index 100% rename from src/mongocxx/pipeline.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/pipeline.hpp diff --git a/src/mongocxx/pool.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/pool.hpp similarity index 100% rename from src/mongocxx/pool.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/pool.hpp diff --git a/src/mongocxx/read_concern.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_concern.hpp similarity index 100% rename from src/mongocxx/read_concern.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_concern.hpp diff --git a/src/mongocxx/read_preference.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_preference.hpp similarity index 100% rename from src/mongocxx/read_preference.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/read_preference.hpp diff --git a/src/mongocxx/result/bulk_write.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp similarity index 100% rename from src/mongocxx/result/bulk_write.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp diff --git a/src/mongocxx/result/delete.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/delete.hpp similarity index 100% rename from src/mongocxx/result/delete.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/delete.hpp diff --git a/src/mongocxx/result/gridfs/upload.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp similarity index 100% rename from src/mongocxx/result/gridfs/upload.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp diff --git a/src/mongocxx/result/insert_many.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp similarity index 100% rename from src/mongocxx/result/insert_many.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp diff --git a/src/mongocxx/result/insert_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp similarity index 100% rename from src/mongocxx/result/insert_one.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp diff --git a/src/mongocxx/result/replace_one.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp similarity index 100% rename from src/mongocxx/result/replace_one.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp diff --git a/src/mongocxx/result/rewrap_many_datakey.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.hpp similarity index 100% rename from src/mongocxx/result/rewrap_many_datakey.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.hpp diff --git a/src/mongocxx/result/update.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/update.hpp similarity index 100% rename from src/mongocxx/result/update.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/update.hpp diff --git a/src/mongocxx/search_index_model.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_model.hpp similarity index 100% rename from src/mongocxx/search_index_model.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_model.hpp diff --git a/src/mongocxx/search_index_view.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_view.hpp similarity index 100% rename from src/mongocxx/search_index_view.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/search_index_view.hpp diff --git a/src/mongocxx/stdx.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/stdx.hpp similarity index 100% rename from src/mongocxx/stdx.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/stdx.hpp diff --git a/src/mongocxx/uri.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/uri.hpp similarity index 100% rename from src/mongocxx/uri.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/uri.hpp diff --git a/src/mongocxx/validation_criteria.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp similarity index 100% rename from src/mongocxx/validation_criteria.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp diff --git a/src/mongocxx/write_concern.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_concern.hpp similarity index 100% rename from src/mongocxx/write_concern.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_concern.hpp diff --git a/src/mongocxx/write_type.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_type.hpp similarity index 100% rename from src/mongocxx/write_type.hpp rename to src/mongocxx/include/mongocxx/v_noabi/mongocxx/write_type.hpp diff --git a/src/mongocxx/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp similarity index 100% rename from src/mongocxx/bulk_write.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp diff --git a/src/mongocxx/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp similarity index 100% rename from src/mongocxx/change_stream.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/change_stream.cpp diff --git a/src/mongocxx/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp similarity index 100% rename from src/mongocxx/client.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client.cpp diff --git a/src/mongocxx/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp similarity index 100% rename from src/mongocxx/client_encryption.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp diff --git a/src/mongocxx/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp similarity index 100% rename from src/mongocxx/client_session.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/client_session.cpp diff --git a/src/mongocxx/collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp similarity index 100% rename from src/mongocxx/collection.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp diff --git a/src/mongocxx/config/CMakeLists.txt b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/CMakeLists.txt similarity index 98% rename from src/mongocxx/config/CMakeLists.txt rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/CMakeLists.txt index f8ca8c172f..b717469b4f 100644 --- a/src/mongocxx/config/CMakeLists.txt +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/CMakeLists.txt @@ -78,12 +78,9 @@ endif() set_dist_list (src_mongocxx_config_DIST CMakeLists.txt - compiler.hpp config.hpp.in libmongocxx-static.pc.in libmongocxx.pc.in - postlude.hpp - prelude.hpp private/config.hh.in private/postlude.hh private/prelude.hh diff --git a/src/mongocxx/config/config.hpp.in b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in similarity index 100% rename from src/mongocxx/config/config.hpp.in rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/config.hpp.in diff --git a/src/mongocxx/config/libmongocxx-static.pc.in b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx-static.pc.in similarity index 100% rename from src/mongocxx/config/libmongocxx-static.pc.in rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx-static.pc.in diff --git a/src/mongocxx/config/libmongocxx.pc.in b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx.pc.in similarity index 100% rename from src/mongocxx/config/libmongocxx.pc.in rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx.pc.in diff --git a/src/mongocxx/config/private/config.hh.in b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/config.hh.in similarity index 100% rename from src/mongocxx/config/private/config.hh.in rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/config.hh.in diff --git a/src/mongocxx/config/private/postlude.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh similarity index 100% rename from src/mongocxx/config/private/postlude.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh diff --git a/src/mongocxx/config/private/prelude.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh similarity index 100% rename from src/mongocxx/config/private/prelude.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh diff --git a/src/mongocxx/config/version.hpp.in b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/version.hpp.in similarity index 100% rename from src/mongocxx/config/version.hpp.in rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/version.hpp.in diff --git a/src/mongocxx/cursor.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp similarity index 100% rename from src/mongocxx/cursor.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/cursor.cpp diff --git a/src/mongocxx/database.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp similarity index 100% rename from src/mongocxx/database.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/database.cpp diff --git a/src/mongocxx/events/command_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp similarity index 100% rename from src/mongocxx/events/command_failed_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp diff --git a/src/mongocxx/events/command_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp similarity index 100% rename from src/mongocxx/events/command_started_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_started_event.cpp diff --git a/src/mongocxx/events/command_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp similarity index 100% rename from src/mongocxx/events/command_succeeded_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.cpp diff --git a/src/mongocxx/events/heartbeat_failed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp similarity index 100% rename from src/mongocxx/events/heartbeat_failed_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.cpp diff --git a/src/mongocxx/events/heartbeat_started_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp similarity index 100% rename from src/mongocxx/events/heartbeat_started_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.cpp diff --git a/src/mongocxx/events/heartbeat_succeeded_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp similarity index 100% rename from src/mongocxx/events/heartbeat_succeeded_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.cpp diff --git a/src/mongocxx/events/server_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp similarity index 100% rename from src/mongocxx/events/server_changed_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_changed_event.cpp diff --git a/src/mongocxx/events/server_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp similarity index 100% rename from src/mongocxx/events/server_closed_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_closed_event.cpp diff --git a/src/mongocxx/events/server_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp similarity index 100% rename from src/mongocxx/events/server_description.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_description.cpp diff --git a/src/mongocxx/events/server_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp similarity index 100% rename from src/mongocxx/events/server_opening_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/server_opening_event.cpp diff --git a/src/mongocxx/events/topology_changed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp similarity index 100% rename from src/mongocxx/events/topology_changed_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_changed_event.cpp diff --git a/src/mongocxx/events/topology_closed_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp similarity index 100% rename from src/mongocxx/events/topology_closed_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp diff --git a/src/mongocxx/events/topology_description.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp similarity index 100% rename from src/mongocxx/events/topology_description.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp diff --git a/src/mongocxx/events/topology_opening_event.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp similarity index 100% rename from src/mongocxx/events/topology_opening_event.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp diff --git a/src/mongocxx/exception/error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp similarity index 100% rename from src/mongocxx/exception/error_code.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp diff --git a/src/mongocxx/exception/operation_exception.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp similarity index 100% rename from src/mongocxx/exception/operation_exception.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/operation_exception.cpp diff --git a/src/mongocxx/exception/private/mongoc_error.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh similarity index 100% rename from src/mongocxx/exception/private/mongoc_error.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/private/mongoc_error.hh diff --git a/src/mongocxx/exception/server_error_code.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp similarity index 100% rename from src/mongocxx/exception/server_error_code.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/exception/server_error_code.cpp diff --git a/src/mongocxx/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp similarity index 100% rename from src/mongocxx/gridfs/bucket.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/bucket.cpp diff --git a/src/mongocxx/gridfs/downloader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp similarity index 100% rename from src/mongocxx/gridfs/downloader.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/downloader.cpp diff --git a/src/mongocxx/gridfs/private/bucket.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh similarity index 100% rename from src/mongocxx/gridfs/private/bucket.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/bucket.hh diff --git a/src/mongocxx/gridfs/private/downloader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh similarity index 100% rename from src/mongocxx/gridfs/private/downloader.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/downloader.hh diff --git a/src/mongocxx/gridfs/private/uploader.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh similarity index 100% rename from src/mongocxx/gridfs/private/uploader.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/private/uploader.hh diff --git a/src/mongocxx/gridfs/uploader.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp similarity index 100% rename from src/mongocxx/gridfs/uploader.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/gridfs/uploader.cpp diff --git a/src/mongocxx/hint.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp similarity index 100% rename from src/mongocxx/hint.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/hint.cpp diff --git a/src/mongocxx/index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp similarity index 100% rename from src/mongocxx/index_model.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_model.cpp diff --git a/src/mongocxx/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp similarity index 100% rename from src/mongocxx/index_view.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/index_view.cpp diff --git a/src/mongocxx/instance.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp similarity index 100% rename from src/mongocxx/instance.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/instance.cpp diff --git a/src/mongocxx/logger.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp similarity index 100% rename from src/mongocxx/logger.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/logger.cpp diff --git a/src/mongocxx/model/delete_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp similarity index 100% rename from src/mongocxx/model/delete_many.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_many.cpp diff --git a/src/mongocxx/model/delete_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp similarity index 100% rename from src/mongocxx/model/delete_one.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/delete_one.cpp diff --git a/src/mongocxx/model/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp similarity index 100% rename from src/mongocxx/model/insert_one.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/insert_one.cpp diff --git a/src/mongocxx/model/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp similarity index 100% rename from src/mongocxx/model/replace_one.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/replace_one.cpp diff --git a/src/mongocxx/model/update_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp similarity index 100% rename from src/mongocxx/model/update_many.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_many.cpp diff --git a/src/mongocxx/model/update_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp similarity index 100% rename from src/mongocxx/model/update_one.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/update_one.cpp diff --git a/src/mongocxx/model/write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp similarity index 100% rename from src/mongocxx/model/write.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/model/write.cpp diff --git a/src/mongocxx/options/aggregate.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp similarity index 100% rename from src/mongocxx/options/aggregate.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/aggregate.cpp diff --git a/src/mongocxx/options/apm.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp similarity index 100% rename from src/mongocxx/options/apm.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/apm.cpp diff --git a/src/mongocxx/options/auto_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp similarity index 100% rename from src/mongocxx/options/auto_encryption.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/auto_encryption.cpp diff --git a/src/mongocxx/options/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp similarity index 100% rename from src/mongocxx/options/bulk_write.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/bulk_write.cpp diff --git a/src/mongocxx/options/change_stream.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp similarity index 100% rename from src/mongocxx/options/change_stream.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/change_stream.cpp diff --git a/src/mongocxx/options/client.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp similarity index 100% rename from src/mongocxx/options/client.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client.cpp diff --git a/src/mongocxx/options/client_encryption.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp similarity index 100% rename from src/mongocxx/options/client_encryption.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_encryption.cpp diff --git a/src/mongocxx/options/client_session.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp similarity index 100% rename from src/mongocxx/options/client_session.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/client_session.cpp diff --git a/src/mongocxx/options/count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp similarity index 100% rename from src/mongocxx/options/count.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/count.cpp diff --git a/src/mongocxx/options/create_collection.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp similarity index 100% rename from src/mongocxx/options/create_collection.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/create_collection.cpp diff --git a/src/mongocxx/options/data_key.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp similarity index 100% rename from src/mongocxx/options/data_key.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/data_key.cpp diff --git a/src/mongocxx/options/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp similarity index 100% rename from src/mongocxx/options/delete.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/delete.cpp diff --git a/src/mongocxx/options/distinct.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp similarity index 100% rename from src/mongocxx/options/distinct.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/distinct.cpp diff --git a/src/mongocxx/options/encrypt.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp similarity index 100% rename from src/mongocxx/options/encrypt.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/encrypt.cpp diff --git a/src/mongocxx/options/estimated_document_count.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp similarity index 100% rename from src/mongocxx/options/estimated_document_count.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/estimated_document_count.cpp diff --git a/src/mongocxx/options/find.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp similarity index 100% rename from src/mongocxx/options/find.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find.cpp diff --git a/src/mongocxx/options/find_one_and_delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp similarity index 100% rename from src/mongocxx/options/find_one_and_delete.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.cpp diff --git a/src/mongocxx/options/find_one_and_replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp similarity index 100% rename from src/mongocxx/options/find_one_and_replace.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.cpp diff --git a/src/mongocxx/options/find_one_and_update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp similarity index 100% rename from src/mongocxx/options/find_one_and_update.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/find_one_and_update.cpp diff --git a/src/mongocxx/options/gridfs/bucket.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp similarity index 100% rename from src/mongocxx/options/gridfs/bucket.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.cpp diff --git a/src/mongocxx/options/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp similarity index 100% rename from src/mongocxx/options/gridfs/upload.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/gridfs/upload.cpp diff --git a/src/mongocxx/options/index.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp similarity index 100% rename from src/mongocxx/options/index.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index.cpp diff --git a/src/mongocxx/options/index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp similarity index 100% rename from src/mongocxx/options/index_view.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/index_view.cpp diff --git a/src/mongocxx/options/insert.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp similarity index 100% rename from src/mongocxx/options/insert.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/insert.cpp diff --git a/src/mongocxx/options/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp similarity index 100% rename from src/mongocxx/options/pool.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/pool.cpp diff --git a/src/mongocxx/options/private/apm.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh similarity index 100% rename from src/mongocxx/options/private/apm.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/apm.hh diff --git a/src/mongocxx/options/private/server_api.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh similarity index 100% rename from src/mongocxx/options/private/server_api.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/server_api.hh diff --git a/src/mongocxx/options/private/ssl.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh similarity index 100% rename from src/mongocxx/options/private/ssl.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/ssl.hh diff --git a/src/mongocxx/options/private/transaction.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh similarity index 100% rename from src/mongocxx/options/private/transaction.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/private/transaction.hh diff --git a/src/mongocxx/options/range.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp similarity index 100% rename from src/mongocxx/options/range.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/range.cpp diff --git a/src/mongocxx/options/replace.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp similarity index 100% rename from src/mongocxx/options/replace.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/replace.cpp diff --git a/src/mongocxx/options/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp similarity index 100% rename from src/mongocxx/options/rewrap_many_datakey.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/rewrap_many_datakey.cpp diff --git a/src/mongocxx/options/server_api.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp similarity index 100% rename from src/mongocxx/options/server_api.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/server_api.cpp diff --git a/src/mongocxx/options/tls.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp similarity index 100% rename from src/mongocxx/options/tls.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/tls.cpp diff --git a/src/mongocxx/options/transaction.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp similarity index 100% rename from src/mongocxx/options/transaction.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/transaction.cpp diff --git a/src/mongocxx/options/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp similarity index 100% rename from src/mongocxx/options/update.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/options/update.cpp diff --git a/src/mongocxx/pipeline.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp similarity index 100% rename from src/mongocxx/pipeline.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pipeline.cpp diff --git a/src/mongocxx/pool.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp similarity index 100% rename from src/mongocxx/pool.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/pool.cpp diff --git a/src/mongocxx/private/append_aggregate_options.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh similarity index 100% rename from src/mongocxx/private/append_aggregate_options.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/append_aggregate_options.hh diff --git a/src/mongocxx/private/bulk_write.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh similarity index 100% rename from src/mongocxx/private/bulk_write.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/bulk_write.hh diff --git a/src/mongocxx/private/change_stream.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh similarity index 100% rename from src/mongocxx/private/change_stream.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/change_stream.hh diff --git a/src/mongocxx/private/client.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh similarity index 100% rename from src/mongocxx/private/client.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client.hh diff --git a/src/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh similarity index 100% rename from src/mongocxx/private/client_encryption.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh diff --git a/src/mongocxx/private/client_session.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh similarity index 100% rename from src/mongocxx/private/client_session.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_session.hh diff --git a/src/mongocxx/private/collection.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh similarity index 100% rename from src/mongocxx/private/collection.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/collection.hh diff --git a/src/mongocxx/private/conversions.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp similarity index 100% rename from src/mongocxx/private/conversions.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.cpp diff --git a/src/mongocxx/private/conversions.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh similarity index 100% rename from src/mongocxx/private/conversions.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/conversions.hh diff --git a/src/mongocxx/private/cursor.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh similarity index 100% rename from src/mongocxx/private/cursor.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/cursor.hh diff --git a/src/mongocxx/private/database.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh similarity index 100% rename from src/mongocxx/private/database.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/database.hh diff --git a/src/mongocxx/private/index_view.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh similarity index 100% rename from src/mongocxx/private/index_view.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/index_view.hh diff --git a/src/mongocxx/private/libbson.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp similarity index 100% rename from src/mongocxx/private/libbson.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.cpp diff --git a/src/mongocxx/private/libbson.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh similarity index 100% rename from src/mongocxx/private/libbson.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libbson.hh diff --git a/src/mongocxx/private/libmongoc.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp similarity index 100% rename from src/mongocxx/private/libmongoc.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.cpp diff --git a/src/mongocxx/private/libmongoc.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh similarity index 100% rename from src/mongocxx/private/libmongoc.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc.hh diff --git a/src/mongocxx/private/libmongoc_symbols.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc_symbols.hh similarity index 100% rename from src/mongocxx/private/libmongoc_symbols.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/libmongoc_symbols.hh diff --git a/src/mongocxx/private/numeric_casting.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp similarity index 100% rename from src/mongocxx/private/numeric_casting.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.cpp diff --git a/src/mongocxx/private/numeric_casting.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh similarity index 100% rename from src/mongocxx/private/numeric_casting.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/numeric_casting.hh diff --git a/src/mongocxx/private/pipeline.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh similarity index 100% rename from src/mongocxx/private/pipeline.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pipeline.hh diff --git a/src/mongocxx/private/pool.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh similarity index 100% rename from src/mongocxx/private/pool.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/pool.hh diff --git a/src/mongocxx/private/read_concern.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh similarity index 100% rename from src/mongocxx/private/read_concern.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_concern.hh diff --git a/src/mongocxx/private/read_preference.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh similarity index 100% rename from src/mongocxx/private/read_preference.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/read_preference.hh diff --git a/src/mongocxx/private/search_index_model.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh similarity index 100% rename from src/mongocxx/private/search_index_model.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_model.hh diff --git a/src/mongocxx/private/search_index_view.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh similarity index 100% rename from src/mongocxx/private/search_index_view.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/search_index_view.hh diff --git a/src/mongocxx/private/uri.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh similarity index 100% rename from src/mongocxx/private/uri.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/uri.hh diff --git a/src/mongocxx/private/write_concern.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh similarity index 100% rename from src/mongocxx/private/write_concern.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/write_concern.hh diff --git a/src/mongocxx/read_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp similarity index 100% rename from src/mongocxx/read_concern.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_concern.cpp diff --git a/src/mongocxx/read_preference.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp similarity index 100% rename from src/mongocxx/read_preference.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/read_preference.cpp diff --git a/src/mongocxx/result/bulk_write.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp similarity index 100% rename from src/mongocxx/result/bulk_write.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/bulk_write.cpp diff --git a/src/mongocxx/result/delete.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp similarity index 100% rename from src/mongocxx/result/delete.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/delete.cpp diff --git a/src/mongocxx/result/gridfs/upload.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp similarity index 100% rename from src/mongocxx/result/gridfs/upload.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/gridfs/upload.cpp diff --git a/src/mongocxx/result/insert_many.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp similarity index 100% rename from src/mongocxx/result/insert_many.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_many.cpp diff --git a/src/mongocxx/result/insert_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp similarity index 100% rename from src/mongocxx/result/insert_one.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/insert_one.cpp diff --git a/src/mongocxx/result/replace_one.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp similarity index 100% rename from src/mongocxx/result/replace_one.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/replace_one.cpp diff --git a/src/mongocxx/result/rewrap_many_datakey.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp similarity index 100% rename from src/mongocxx/result/rewrap_many_datakey.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/rewrap_many_datakey.cpp diff --git a/src/mongocxx/result/update.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp similarity index 100% rename from src/mongocxx/result/update.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/result/update.cpp diff --git a/src/mongocxx/search_index_model.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp similarity index 100% rename from src/mongocxx/search_index_model.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_model.cpp diff --git a/src/mongocxx/search_index_view.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp similarity index 100% rename from src/mongocxx/search_index_view.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/search_index_view.cpp diff --git a/src/mongocxx/test_util/client_helpers.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/client_helpers.cpp similarity index 100% rename from src/mongocxx/test_util/client_helpers.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/client_helpers.cpp diff --git a/src/mongocxx/test_util/client_helpers.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/client_helpers.hh similarity index 100% rename from src/mongocxx/test_util/client_helpers.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/client_helpers.hh diff --git a/src/mongocxx/test_util/export_for_testing.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh similarity index 100% rename from src/mongocxx/test_util/export_for_testing.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh diff --git a/src/mongocxx/test_util/mock.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh similarity index 100% rename from src/mongocxx/test_util/mock.hh rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/mock.hh diff --git a/src/mongocxx/uri.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp similarity index 100% rename from src/mongocxx/uri.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/uri.cpp diff --git a/src/mongocxx/validation_criteria.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp similarity index 100% rename from src/mongocxx/validation_criteria.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/validation_criteria.cpp diff --git a/src/mongocxx/write_concern.cpp b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp similarity index 100% rename from src/mongocxx/write_concern.cpp rename to src/mongocxx/lib/mongocxx/v_noabi/mongocxx/write_concern.cpp diff --git a/src/mongocxx/test/CMakeLists.txt b/src/mongocxx/test/CMakeLists.txt index 9bc8c704a7..1a70f56eb9 100644 --- a/src/mongocxx/test/CMakeLists.txt +++ b/src/mongocxx/test/CMakeLists.txt @@ -93,8 +93,10 @@ set(spec_test_common spec/util.cpp ) +set(client_helpers_cpp ${PROJECT_SOURCE_DIR}/lib/mongocxx/v_noabi/mongocxx/test_util/client_helpers.cpp) + add_executable(test_driver - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp ${test_driver_sources} ) @@ -114,63 +116,63 @@ add_executable(test_instance ) add_executable(test_crud_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/crud.cpp ${spec_test_common} ) add_executable(test_gridfs_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/gridfs.cpp ${spec_test_common} ) add_executable(test_client_side_encryption_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/client_side_encryption.cpp ${spec_test_common} ) add_executable(test_command_monitoring_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/command_monitoring.cpp ${spec_test_common} ) add_executable(test_transactions_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/transactions.cpp ${spec_test_common} ) add_executable(test_retryable_reads_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/retryable-reads.cpp ${spec_test_common} ) add_executable(test_read_write_concern_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/read_write_concern.cpp ${spec_test_common} ) add_executable(test_mongohouse_specs - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/mongohouse.cpp ${spec_test_common} ) add_executable(test_unified_format_spec - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp spec/unified_tests/operations.cpp spec/unified_tests/runner.cpp @@ -178,7 +180,7 @@ add_executable(test_unified_format_spec ) add_executable(test_versioned_api - ${PROJECT_SOURCE_DIR}/test_util/client_helpers.cpp + ${client_helpers_cpp} ${THIRD_PARTY_SOURCE_DIR}/catch/main.cpp versioned_api.cpp ${spec_test_common} From f5074dbc53d307f77f5f8911aec65db0a87118e6 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 18 Sep 2023 16:23:56 -0500 Subject: [PATCH 3/9] Move pkgconfig config input files into cmake subdirectory --- src/bsoncxx/CMakeLists.txt | 31 ++++++++++++++++++ .../config => cmake}/libbsoncxx-static.pc.in | 0 .../bsoncxx/config => cmake}/libbsoncxx.pc.in | 0 .../v_noabi/bsoncxx/config/CMakeLists.txt | 32 ------------------- src/mongocxx/CMakeLists.txt | 32 +++++++++++++++++++ .../config => cmake}/libmongocxx-static.pc.in | 0 .../config => cmake}/libmongocxx.pc.in | 0 .../v_noabi/mongocxx/config/CMakeLists.txt | 32 ------------------- 8 files changed, 63 insertions(+), 64 deletions(-) rename src/bsoncxx/{lib/bsoncxx/v_noabi/bsoncxx/config => cmake}/libbsoncxx-static.pc.in (100%) rename src/bsoncxx/{lib/bsoncxx/v_noabi/bsoncxx/config => cmake}/libbsoncxx.pc.in (100%) rename src/mongocxx/{lib/mongocxx/v_noabi/mongocxx/config => cmake}/libmongocxx-static.pc.in (100%) rename src/mongocxx/{lib/mongocxx/v_noabi/mongocxx/config => cmake}/libmongocxx.pc.in (100%) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt index 455cc9bd86..0729c07de2 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt @@ -194,6 +194,35 @@ if(ENABLE_TESTS) target_compile_definitions(bsoncxx_testing PUBLIC BSONCXX_TESTING) endif() +set (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") + +if(BSONCXX_BUILD_SHARED) + configure_file( + cmake/libbsoncxx.pc.in + cmake/libbsoncxx.pc + @ONLY + ) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/cmake/libbsoncxx.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT dev + ) +endif() + +if(BSONCXX_BUILD_STATIC) + configure_file( + cmake/libbsoncxx-static.pc.in + cmake/libbsoncxx-static.pc + @ONLY + ) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/cmake/libbsoncxx-static.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT dev + ) +endif() install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} @@ -242,6 +271,8 @@ set_local_dist (src_bsoncxx_lib_v_noabi_DIST_local cmake/bsoncxx-config.cmake.in cmake/libbsoncxx-config.cmake.in cmake/libbsoncxx-static-config.cmake.in + cmake/libbsoncxx-static.pc.in + cmake/libbsoncxx.pc.in lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx-static.pc.in b/src/bsoncxx/cmake/libbsoncxx-static.pc.in similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx-static.pc.in rename to src/bsoncxx/cmake/libbsoncxx-static.pc.in diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx.pc.in b/src/bsoncxx/cmake/libbsoncxx.pc.in similarity index 100% rename from src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/libbsoncxx.pc.in rename to src/bsoncxx/cmake/libbsoncxx.pc.in diff --git a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/CMakeLists.txt b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/CMakeLists.txt index b730f1433f..853298c82e 100644 --- a/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/CMakeLists.txt +++ b/src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/config/CMakeLists.txt @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -set (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/config.hpp @@ -36,39 +34,9 @@ install(FILES COMPONENT dev ) -if(BSONCXX_BUILD_SHARED) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libbsoncxx.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libbsoncxx.pc - @ONLY - ) - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/libbsoncxx.pc" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT dev - ) -endif() - -if(BSONCXX_BUILD_STATIC) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libbsoncxx-static.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libbsoncxx-static.pc - @ONLY - ) - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/libbsoncxx-static.pc" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT dev - ) -endif() - set_dist_list (src_bsoncxx_config_DIST CMakeLists.txt config.hpp.in - libbsoncxx-static.pc.in - libbsoncxx.pc.in private/config.hh.in private/postlude.hh private/prelude.hh diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt index 709ee3576e..b822a4e49f 100644 --- a/src/mongocxx/CMakeLists.txt +++ b/src/mongocxx/CMakeLists.txt @@ -227,6 +227,36 @@ set(PACKAGE_LIBRARIES mongocxx) include(CMakePackageConfigHelpers) +set (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") + +if(MONGOCXX_BUILD_SHARED) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libmongocxx.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake/libmongocxx.pc + @ONLY + ) + + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/cmake/libmongocxx.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT dev + ) +endif() + +if(MONGOCXX_BUILD_STATIC) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libmongocxx-static.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake/libmongocxx-static.pc + @ONLY + ) + + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/cmake/libmongocxx-static.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + COMPONENT dev + ) +endif() + set(mongocxx_target_list "") if(MONGOCXX_BUILD_SHARED) mongocxx_install_deprecated_cmake(mongocxx) @@ -253,6 +283,8 @@ set_local_dist (src_mongocxx_lib_v_noabi_DIST_local cmake/mongocxx-config.cmake.in cmake/libmongocxx-config.cmake.in cmake/libmongocxx-static-config.cmake.in + cmake/libmongocxx-static.pc.in + cmake/libmongocxx.pc.in lib/mongocxx/v_noabi/mongocxx/collection.cpp lib/mongocxx/v_noabi/mongocxx/cursor.cpp lib/mongocxx/v_noabi/mongocxx/database.cpp diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx-static.pc.in b/src/mongocxx/cmake/libmongocxx-static.pc.in similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx-static.pc.in rename to src/mongocxx/cmake/libmongocxx-static.pc.in diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx.pc.in b/src/mongocxx/cmake/libmongocxx.pc.in similarity index 100% rename from src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/libmongocxx.pc.in rename to src/mongocxx/cmake/libmongocxx.pc.in diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/CMakeLists.txt b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/CMakeLists.txt index b717469b4f..5c984c6dc1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/CMakeLists.txt +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/CMakeLists.txt @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -set (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/version.hpp @@ -48,39 +46,9 @@ install(FILES COMPONENT dev ) -if(MONGOCXX_BUILD_SHARED) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libmongocxx.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libmongocxx.pc - @ONLY - ) - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/libmongocxx.pc" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT dev - ) -endif() - -if(MONGOCXX_BUILD_STATIC) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libmongocxx-static.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libmongocxx-static.pc - @ONLY - ) - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/libmongocxx-static.pc" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT dev - ) -endif() - set_dist_list (src_mongocxx_config_DIST CMakeLists.txt config.hpp.in - libmongocxx-static.pc.in - libmongocxx.pc.in private/config.hh.in private/postlude.hh private/prelude.hh From 5f9ac0c594560f6e692fc6018c09d248f6720f89 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 18 Sep 2023 17:19:41 -0500 Subject: [PATCH 4/9] Support multiple paths in PACKAGE_INCLUDE_INSTALL_DIRS --- src/bsoncxx/CMakeLists.txt | 10 +++++----- src/bsoncxx/cmake/libbsoncxx-config.cmake.in | 7 +++++-- src/bsoncxx/cmake/libbsoncxx-static-config.cmake.in | 7 +++++-- src/mongocxx/cmake/libmongocxx-config.cmake.in | 9 ++++++--- src/mongocxx/cmake/libmongocxx-static-config.cmake.in | 9 ++++++--- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt index 0729c07de2..1417d42a58 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt @@ -76,10 +76,7 @@ set(BSONCXX_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/bsoncxx/${BSONCXX_IN if (BSONCXX_POLY_USE_MNMLSTC AND NOT BSONCXX_POLY_USE_SYSTEM_MNMLSTC) # For deprecated CMake package config files. set(BSONCXX_POLY_MNMLSTC_DEPRECATED_INCLUDE_DIRS - [[list(PREPEND LIBBSONCXX_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/bsoncxx/v_noabi/bsoncxx/third_party/mnmlstc")]] - ) - set(BSONCXX_POLY_MNMLSTC_DEPRECATED_STATIC_INCLUDE_DIRS - [[list(PREPEND LIBBSONCXX_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/bsoncxx/v_noabi/bsoncxx/third_party/mnmlstc")]] + "${CMAKE_INSTALL_INCLUDEDIR}/bsoncxx/v_noabi/bsoncxx/third_party/mnmlstc" ) # For pkg-config files. Trailing space to separate cflags. @@ -237,7 +234,10 @@ install(FILES COMPONENT dev ) -set(PACKAGE_INCLUDE_INSTALL_DIRS ${BSONCXX_HEADER_INSTALL_DIR}) +set(PACKAGE_INCLUDE_INSTALL_DIRS + ${BSONCXX_HEADER_INSTALL_DIR} + ${BSONCXX_POLY_MNMLSTC_DEPRECATED_INCLUDE_DIRS} +) set(PACKAGE_LIBRARY_INSTALL_DIRS ${CMAKE_INSTALL_LIBDIR}) set(PACKAGE_LIBRARIES bsoncxx) diff --git a/src/bsoncxx/cmake/libbsoncxx-config.cmake.in b/src/bsoncxx/cmake/libbsoncxx-config.cmake.in index ea6da4cb81..84492f032b 100644 --- a/src/bsoncxx/cmake/libbsoncxx-config.cmake.in +++ b/src/bsoncxx/cmake/libbsoncxx-config.cmake.in @@ -21,8 +21,11 @@ set(LIBBSONCXX_PACKAGE_VERSION @BSONCXX_VERSION@) @PACKAGE_INIT@ -set_and_check(LIBBSONCXX_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_INCLUDE_INSTALL_DIRS@") -@BSONCXX_POLY_MNMLSTC_DEPRECATED_INCLUDE_DIRS@ +set(LIBBSONCXX_INCLUDE_DIRS "") +foreach(_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIRS@) + set_and_check(_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/${_INCLUDE_DIR}") + list(APPEND LIBBSONCXX_INCLUDE_DIRS "${_INCLUDE_DIR}") +endforeach() # We want to provide an absolute path to the library and we know the # directory and the base name, but not the suffix, so we use CMake's diff --git a/src/bsoncxx/cmake/libbsoncxx-static-config.cmake.in b/src/bsoncxx/cmake/libbsoncxx-static-config.cmake.in index 7dcf9e5229..7d8c9dfc18 100644 --- a/src/bsoncxx/cmake/libbsoncxx-static-config.cmake.in +++ b/src/bsoncxx/cmake/libbsoncxx-static-config.cmake.in @@ -27,8 +27,11 @@ find_package(libbson-static-@LIBBSON_REQUIRED_ABI_VERSION@ @LIBBSON_REQUIRED_VER @PACKAGE_INIT@ -set_and_check(LIBBSONCXX_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_INCLUDE_INSTALL_DIRS@") -@BSONCXX_POLY_MNMLSTC_DEPRECATED_STATIC_INCLUDE_DIRS@ +set(LIBBSONCXX_STATIC_INCLUDE_DIRS "") +foreach(_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIRS@) + set_and_check(_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/${_INCLUDE_DIR}") + list(APPEND LIBBSONCXX_STATIC_INCLUDE_DIRS "${_INCLUDE_DIR}") +endforeach() # We want to provide an absolute path to the library and we know the directory and the base name, # but not the suffix, so we use CMake's find_library() to pick that up. diff --git a/src/mongocxx/cmake/libmongocxx-config.cmake.in b/src/mongocxx/cmake/libmongocxx-config.cmake.in index 84e25a96ee..befb4c8666 100644 --- a/src/mongocxx/cmake/libmongocxx-config.cmake.in +++ b/src/mongocxx/cmake/libmongocxx-config.cmake.in @@ -23,9 +23,12 @@ find_package(libbsoncxx @MONGOCXX_VERSION_NO_EXTRA@ REQUIRED) @PACKAGE_INIT@ -set_and_check(LIBMONGOCXX_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_INCLUDE_INSTALL_DIRS@") - -set(LIBMONGOCXX_INCLUDE_DIRS ${LIBMONGOCXX_INCLUDE_DIRS} ${LIBBSONCXX_INCLUDE_DIRS}) +set(LIBMONGOCXX_INCLUDE_DIRS "") +foreach(_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIRS@) + set_and_check(_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/${_INCLUDE_DIR}") + list(APPEND LIBMONGOCXX_INCLUDE_DIRS "${_INCLUDE_DIR}") +endforeach() +list(APPEND LIBMONGOCXX_INCLUDE_DIRS ${LIBBSONCXX_INCLUDE_DIRS}) # We want to provide an absolute path to the library and we know the # directory and the base name, but not the suffix, so we use CMake's diff --git a/src/mongocxx/cmake/libmongocxx-static-config.cmake.in b/src/mongocxx/cmake/libmongocxx-static-config.cmake.in index 83f47e59b3..0c7ab4d66e 100644 --- a/src/mongocxx/cmake/libmongocxx-static-config.cmake.in +++ b/src/mongocxx/cmake/libmongocxx-static-config.cmake.in @@ -29,9 +29,12 @@ find_package(libmongoc-static-1.0 @LIBMONGOC_REQUIRED_VERSION@ REQUIRED) @PACKAGE_INIT@ -set_and_check(LIBMONGOCXX_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_INCLUDE_INSTALL_DIRS@") - -set(LIBMONGOCXX_STATIC_INCLUDE_DIRS ${LIBMONGOCXX_STATIC_INCLUDE_DIRS} ${LIBBSONCXX_STATIC_INCLUDE_DIRS}) +set(LIBMONGOCXX_STATIC_INCLUDE_DIRS "") +foreach(_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIRS@) + set_and_check(_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/${_INCLUDE_DIR}") + list(APPEND LIBMONGOCXX_STATIC_INCLUDE_DIRS "${_INCLUDE_DIR}") +endforeach() +list(APPEND LIBMONGOCXX_STATIC_INCLUDE_DIRS ${LIBBSONCXX_STATIC_INCLUDE_DIRS}) # We want to provide an absolute path to the library and we know the directory and the base name, # but not the suffix, so we use CMake's find_library() to pick that up. From d9c23fb8f4cba0067b014eca7f08738ddefd0b07 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 19 Sep 2023 13:31:57 -0500 Subject: [PATCH 5/9] Add reset of BSONCXX_POLY_MNMLSTC_* variables before assignment --- src/bsoncxx/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt index 1417d42a58..aa23bcc25c 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt @@ -73,6 +73,9 @@ message ("bsoncxx version: ${BSONCXX_VERSION}") set(BSONCXX_INLINE_NAMESPACE "v${BSONCXX_ABI_VERSION}") set(BSONCXX_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/bsoncxx/${BSONCXX_INLINE_NAMESPACE}" CACHE INTERNAL "") +set(BSONCXX_POLY_MNMLSTC_DEPRECATED_INCLUDE_DIRS "") +set(BSONCXX_POLY_MNMLSTC_PKGCONFIG_INCLUDE_DIRS "") +set(BSONCXX_POLY_MNMLSTC_PKGCONFIG_STATIC_INCLUDE_DIRS "") if (BSONCXX_POLY_USE_MNMLSTC AND NOT BSONCXX_POLY_USE_SYSTEM_MNMLSTC) # For deprecated CMake package config files. set(BSONCXX_POLY_MNMLSTC_DEPRECATED_INCLUDE_DIRS From 15716631e5c6d7ad13a97915b95c79c45c677669 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 20 Sep 2023 13:40:21 -0500 Subject: [PATCH 6/9] Remove redundant FILES_MATCHING pattern for public headers --- src/bsoncxx/CMakeLists.txt | 2 -- src/mongocxx/CMakeLists.txt | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt index aa23bcc25c..36a1127e5c 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt @@ -227,8 +227,6 @@ endif() install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev - FILES_MATCHING - PATTERN "*.hpp" ) install(FILES diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt index b822a4e49f..334f0bda18 100644 --- a/src/mongocxx/CMakeLists.txt +++ b/src/mongocxx/CMakeLists.txt @@ -211,8 +211,6 @@ endif() install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev - FILES_MATCHING - PATTERN "*.hpp" ) install(FILES From 82d168d95cf59da087f49d25c1f5d059cf5012ba Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 25 Sep 2023 13:43:22 -0500 Subject: [PATCH 7/9] Update comments in config headers --- .../include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp | 8 ++++---- .../include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp | 6 +++--- .../include/mongocxx/v_noabi/mongocxx/config/postlude.hpp | 8 ++++---- .../include/mongocxx/v_noabi/mongocxx/config/prelude.hpp | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp index 15570c623a..660a3779e8 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp @@ -21,7 +21,7 @@ #undef BSONCXX_CALL #pragma pop_macro("BSONCXX_CALL") -// src/bsoncxx/config/config.hpp.in +// config.hpp (generated by CMake) #undef BSONCXX_INLINE_NAMESPACE_BEGIN #pragma pop_macro("BSONCXX_INLINE_NAMESPACE_BEGIN") #undef BSONCXX_INLINE_NAMESPACE_END @@ -35,7 +35,7 @@ #undef BSONCXX_POLY_USE_BOOST #pragma pop_macro("BSONCXX_POLY_USE_BOOST") -// src/bsoncxx/config/version.hpp.in +// version.hpp (generated by CMake) #undef BSONCXX_VERSION_EXTRA #pragma pop_macro("BSONCXX_VERSION_EXTRA") #undef BSONCXX_VERSION_MAJOR @@ -45,13 +45,13 @@ #undef BSONCXX_VERSION_PATCH #pragma pop_macro("BSONCXX_VERSION_PATCH") -// src/bsoncxx/types.hpp +// bsoncxx/types.hpp #ifdef BSONCXX_ENUM static_assert(false, "BSONCXX_ENUM must be undef'ed"); #endif #pragma pop_macro("BSONCXX_ENUM") -// export.hpp (generated by cmake) +// export.hpp (generated by CMake) #undef BSONCXX_API_H #pragma pop_macro("BSONCXX_API_H") #undef BSONCXX_API diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp index 7e5165a4c7..e55da7d480 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp @@ -18,7 +18,7 @@ #pragma push_macro("BSONCXX_CALL") #undef BSONCXX_CALL -// src/bsoncxx/config/config.hpp.in +// config.hpp (generated by CMake) #pragma push_macro("BSONCXX_INLINE_NAMESPACE_BEGIN") #undef BSONCXX_INLINE_NAMESPACE_BEGIN #pragma push_macro("BSONCXX_INLINE_NAMESPACE_END") @@ -32,7 +32,7 @@ #pragma push_macro("BSONCXX_POLY_USE_BOOST") #undef BSONCXX_POLY_USE_BOOST -// src/bsoncxx/config/version.hpp.in +// version.hpp (generated by CMake) #pragma push_macro("BSONCXX_VERSION_EXTRA") #undef BSONCXX_VERSION_EXTRA #pragma push_macro("BSONCXX_VERSION_MAJOR") @@ -42,7 +42,7 @@ #pragma push_macro("BSONCXX_VERSION_PATCH") #undef BSONCXX_VERSION_PATCH -// src/bsoncxx/types.hpp +// bsoncxx/types.hpp #pragma push_macro("BSONCXX_ENUM") #undef BSONCXX_ENUM diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp index cb5f665515..2a81f3530a 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// src/mongocxx/config/compiler.hpp +// compiler.hpp #undef MONGOCXX_INLINE #pragma pop_macro("MONGOCXX_INLINE") #if defined(_MSC_VER) @@ -21,13 +21,13 @@ #undef MONGOCXX_CALL #pragma pop_macro("MONGOCXX_CALL") -// src/mongocxx/config/config.hpp.in +// config.hpp (generated by CMake) #undef MONGOCXX_INLINE_NAMESPACE_BEGIN #pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN") #undef MONGOCXX_INLINE_NAMESPACE_END #pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_END") -// src/mongocxx/config/version.hpp.in +// version.hpp (generated by CMake) #undef MONGOCXX_VERSION_STRING #pragma pop_macro("MONGOCXX_VERSION_STRING") #undef MONGOCXX_VERSION_EXTRA @@ -39,7 +39,7 @@ #undef MONGOCXX_VERSION_PATCH #pragma pop_macro("MONGOCXX_VERSION_PATCH") -// export.hpp (generated by cmake) +// export.hpp (generated by CMake) #undef MONGOCXX_API_H #pragma pop_macro("MONGOCXX_API_H") #undef MONGOCXX_API diff --git a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp index df1162bf44..4fa8f55ced 100644 --- a/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp +++ b/src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -// src/mongocxx/config/compiler.hpp +// compiler.hpp #pragma push_macro("MONGOCXX_INLINE") #undef MONGOCXX_INLINE #pragma push_macro("MONGOCXX_CALL") #undef MONGOCXX_CALL -// src/mongocxx/config/config.hpp.in +// config.hpp (generated by CMake) #pragma push_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN") #undef MONGOCXX_INLINE_NAMESPACE_BEGIN #pragma push_macro("MONGOCXX_INLINE_NAMESPACE_END") #undef MONGOCXX_INLINE_NAMESPACE_END -// src/mongocxx/config/version.hpp.in +// version.hpp (generated by CMake) #pragma push_macro("MONGOCXX_VERSION_STRING") #undef MONGOCXX_VERSION_STRING #pragma push_macro("MONGOCXX_VERSION_EXTRA") @@ -36,7 +36,7 @@ #pragma push_macro("MONGOCXX_VERSION_PATCH") #undef MONGOCXX_VERSION_PATCH -// export.hpp (generated by cmake) +// export.hpp (generated by CMake) #pragma push_macro("MONGOCXX_API_H") #undef MONGOCXX_API_H #pragma push_macro("MONGOCXX_API") From 70dc99e233be3ff1b5f091d4918b5b1e1a3378b8 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 2 Oct 2023 15:18:22 -0500 Subject: [PATCH 8/9] Update more comments with paths to source files --- .../lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh | 2 +- .../lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh | 2 +- .../mongocxx/v_noabi/mongocxx/private/client_encryption.hh | 2 +- .../mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh index 3432fc89ca..eb9a3129e3 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/postlude.hh @@ -15,7 +15,7 @@ // NOTE: Pop any macros here that are defined by the headers included // in private/prelude.hpp. -// src/mongocxx/config/private/config.hh (generated by cmake) +// config.hh (generated by CMake) #undef MONGOCXX_ENABLE_SSL #pragma pop_macro("MONGOCXX_ENABLE_SSL") #undef MONGOCXX_COMPILER_ID diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh index 4053e0f532..7ad3e733ef 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/config/private/prelude.hh @@ -17,7 +17,7 @@ // NOTE: Push any macros here that are defined by the following // headers here. -// src/mongocxx/config/private/config.hh (generated by cmake) +// config.hh (generated by CMake) #pragma push_macro("MONGOCXX_ENABLE_SSL") #undef MONGOCXX_ENABLE_SSL #pragma push_macro("MONGOCXX_COMPILER_ID") diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh index 37359f66bb..45f7a46ad1 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private/client_encryption.hh @@ -263,7 +263,7 @@ class client_encryption::impl { // refers to this as "nRemoved". Make a new document with the field name // changed to get around this. // - // See: mongo-cxx-driver/src/mongocxx/result/bulk_write.cpp + // See: mongocxx/v_noabi/mongocxx/result/bulk_write.cpp // Function: std::int32_t bulk_write::deleted_count() const { // return view()["nRemoved"].get_int32(); // } diff --git a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh index 401d346422..7a67bf9865 100644 --- a/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh +++ b/src/mongocxx/lib/mongocxx/v_noabi/mongocxx/test_util/export_for_testing.hh @@ -16,8 +16,8 @@ #include -// See comment at src/bsoncxx/test_util/export_for_testing.hh for an explanation of the purpose of -// this header. +// See src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/test_util/export_for_testing.hh for an explanation of +// the purpose of this header. #ifdef MONGOCXX_TESTING #define MONGOCXX_TEST_API MONGOCXX_API From 40ac76afcbcde8f67b77706bae5ba8a12529e2c3 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 2 Oct 2023 15:26:10 -0500 Subject: [PATCH 9/9] Case consistency in prelude.hpp --- src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp index e55da7d480..307a9a073d 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp @@ -46,7 +46,7 @@ #pragma push_macro("BSONCXX_ENUM") #undef BSONCXX_ENUM -// export.hpp (generated by cmake) +// export.hpp (generated by CMake) #pragma push_macro("BSONCXX_API_H") #undef BSONCXX_API_H #pragma push_macro("BSONCXX_API")