couchbase 4.4.1 → 4.4.2

package/deps/couchbase-cxx-cache/asio/b710bc0ca14b231d20e983b02d27485125c7860e/asio/asio/src/asio_ssl.cpp

@@ -0,0 +1,11 @@
+//
+// asio_ssl.cpp
+// ~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include "asio/ssl/impl/src.hpp"

package/deps/couchbase-cxx-cache/mozilla-ca-bundle.crt

@@ -1,7 +1,9 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Jul  2 03:12:04 2024 GMT
+## Certificate data from Mozilla as of: Tue Sep 24 03:12:04 2024 GMT
+##
+## Find updated versions here: https://curl.se/docs/caextract.html
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +16,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 456ff095dde6dd73354c5c28c73d9c06f53b61a803963414cb91a1d92945cdd3
+## SHA256: 36105b01631f9fc03b1eca779b44a30a1a5890b9bf8dc07ccb001a07301e01cf
 ##
 
 
@@ -3566,3 +3568,99 @@ Y1w8ndYn81LsF7Kpryz3dvgwHQYDVR0OBBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB
 cFBTApFwhVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dGXSaQ
 pYXFuXqUPoeovQA=
 -----END CERTIFICATE-----
+
+TWCA CYBER Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIQQAE0jMIAAAAAAAAAATzyxjANBgkqhkiG9w0BAQwFADBQMQswCQYDVQQG
+EwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NB
+IENZQkVSIFJvb3QgQ0EwHhcNMjIxMTIyMDY1NDI5WhcNNDcxMTIyMTU1OTU5WjBQMQswCQYDVQQG
+EwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NB
+IENZQkVSIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG+Moe2Qkgfh1s
+Ts6P40czRJzHyWmqOlt47nDSkvgEs1JSHWdyKKHfi12VCv7qze33Kc7wb3+szT3vsxxFavcokPFh
+V8UMxKNQXd7UtcsZyoC5dc4pztKFIuwCY8xEMCDa6pFbVuYdHNWdZsc/34bKS1PE2Y2yHer43CdT
+o0fhYcx9tbD47nORxc5zb87uEB8aBs/pJ2DFTxnk684iJkXXYJndzk834H/nY62wuFm40AZoNWDT
+Nq5xQwTxaWV4fPMf88oon1oglWa0zbfuj3ikRRjpJi+NmykosaS3Om251Bw4ckVYsV7r8Cibt4LK
+/c/WMw+f+5eesRycnupfXtuq3VTpMCEobY5583WSjCb+3MX2w7DfRFlDo7YDKPYIMKoNM+HvnKkH
+IuNZW0CP2oi3aQiotyMuRAlZN1vH4xfyIutuOVLF3lSnmMlLIJXcRolftBL5hSmO68gnFSDAS9TM
+fAxsNAwmmyYxpjyn9tnQS6Jk/zuZQXLB4HCX8SS7K8R0IrGsayIyJNN4KsDAoS/xUgXJP+92ZuJF
+2A09rZXIx4kmyA+upwMu+8Ff+iDhcK2wZSA3M2Cw1a/XDBzCkHDXShi8fgGwsOsVHkQGzaRP6AzR
+wyAQ4VRlnrZR0Bp2a0JaWHY06rc3Ga4udfmW5cFZ95RXKSWNOkyrTZpB0F8mAwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSdhWEUfMFib5do5E83
+QOGt4A1WNzAdBgNVHQ4EFgQUnYVhFHzBYm+XaORPN0DhreANVjcwDQYJKoZIhvcNAQEMBQADggIB
+AGSPesRiDrWIzLjHhg6hShbNcAu3p4ULs3a2D6f/CIsLJc+o1IN1KriWiLb73y0ttGlTITVX1olN
+c79pj3CjYcya2x6a4CD4bLubIp1dhDGaLIrdaqHXKGnK/nZVekZn68xDiBaiA9a5F/gZbG0jAn/x
+X9AKKSM70aoK7akXJlQKTcKlTfjF/biBzysseKNnTKkHmvPfXvt89YnNdJdhEGoHK4Fa0o635yDR
+IG4kqIQnoVesqlVYL9zZyvpoBJ7tRCT5dEA7IzOrg1oYJkK2bVS1FmAwbLGg+LhBoF1JSdJlBTrq
+/p1hvIbZv97Tujqxf36SNI7JAG7cmL3c7IAFrQI932XtCwP39xaEBDG6k5TY8hL4iuO/Qq+n1M0R
+FxbIQh0UqEL20kCGoE8jypZFVmAGzbdVAaYBlGX+bgUJurSkquLvWL69J1bY73NxW0Qz8ppy6rBe
+Pm6pUlvscG21h483XjyMnM7k8M4MZ0HMzvaAq07MTFb1wWFZk7Q+ptq4NxKfKjLji7gh7MMrZQzv
+It6IKTtM1/r+t+FHvpw+PoP7UV31aPcuIYXcv/Fa4nzXxeSDwWrruoBa3lwtcHb4yOWHh8qgnaHl
+IhInD0Q9HWzq1MKLL295q39QpsQZp6F6t5b5wR9iWqJDB0BeJsas7a5wFsWqynKKTbDPAYsDP27X
+-----END CERTIFICATE-----
+
+SecureSign Root CA12
+====================
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUZvnHwa/swlG07VOX5uaCwysckBYwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBMdGQuMR0wGwYDVQQDExRT
+ZWN1cmVTaWduIFJvb3QgQ0ExMjAeFw0yMDA0MDgwNTM2NDZaFw00MDA0MDgwNTM2NDZaMFExCzAJ
+BgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMU
+U2VjdXJlU2lnbiBSb290IENBMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6OcE3
+emhFKxS06+QT61d1I02PJC0W6K6OyX2kVzsqdiUzg2zqMoqUm048luT9Ub+ZyZN+v/mtp7JIKwcc
+J/VMvHASd6SFVLX9kHrko+RRWAPNEHl57muTH2SOa2SroxPjcf59q5zdJ1M3s6oYwlkm7Fsf0uZl
+fO+TvdhYXAvA42VvPMfKWeP+bl+sg779XSVOKik71gurFzJ4pOE+lEa+Ym6b3kaosRbnhW70CEBF
+EaCeVESE99g2zvVQR9wsMJvuwPWW0v4JhscGWa5Pro4RmHvzC1KqYiaqId+OJTN5lxZJjfU+1Uef
+NzFJM3IFTQy2VYzxV4+Kh9GtxRESOaCtAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBRXNPN0zwRL1SXm8UC2LEzZLemgrTANBgkqhkiG9w0BAQsFAAOC
+AQEAPrvbFxbS8hQBICw4g0utvsqFepq2m2um4fylOqyttCg6r9cBg0krY6LdmmQOmFxv3Y67ilQi
+LUoT865AQ9tPkbeGGuwAtEGBpE/6aouIs3YIcipJQMPTw4WJmBClnW8Zt7vPemVV2zfrPIpyMpce
+mik+rY3moxtt9XUa5rBouVui7mlHJzWhhpmA8zNL4WukJsPvdFlseqJkth5Ew1DgDzk9qTPxpfPS
+vWKErI4cqc1avTc7bgoitPQV55FYxTpE05Uo2cBl6XLK0A+9H7MV2anjpEcJnuDLN/v9vZfVvhga
+aaI5gdka9at/yOPiZwud9AzqVN/Ssq+xIvEg37xEHA==
+-----END CERTIFICATE-----
+
+SecureSign Root CA14
+====================
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIUZNtaDCBO6Ncpd8hQJ6JaJ90t8sswDQYJKoZIhvcNAQEMBQAwUTELMAkG
+A1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBMdGQuMR0wGwYDVQQDExRT
+ZWN1cmVTaWduIFJvb3QgQ0ExNDAeFw0yMDA0MDgwNzA2MTlaFw00NTA0MDgwNzA2MTlaMFExCzAJ
+BgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMU
+U2VjdXJlU2lnbiBSb290IENBMTQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF0nqh
+1oq/FjHQmNE6lPxauG4iwWL3pwon71D2LrGeaBLwbCRjOfHw3xDG3rdSINVSW0KZnvOgvlIfX8xn
+bacuUKLBl422+JX1sLrcneC+y9/3OPJH9aaakpUqYllQC6KxNedlsmGy6pJxaeQp8E+BgQQ8sqVb
+1MWoWWd7VRxJq3qdwudzTe/NCcLEVxLbAQ4jeQkHO6Lo/IrPj8BGJJw4J+CDnRugv3gVEOuGTgpa
+/d/aLIJ+7sr2KeH6caH3iGicnPCNvg9JkdjqOvn90Ghx2+m1K06Ckm9mH+Dw3EzsytHqunQG+bOE
+kJTRX45zGRBdAuVwpcAQ0BB8b8VYSbSwbprafZX1zNoCr7gsfXmPvkPx+SgojQlD+Ajda8iLLCSx
+jVIHvXiby8posqTdDEx5YMaZ0ZPxMBoH064iwurO8YQJzOAUbn8/ftKChazcqRZOhaBgy/ac18iz
+ju3Gm5h1DVXoX+WViwKkrkMpKBGk5hIwAUt1ax5mnXkvpXYvHUC0bcl9eQjs0Wq2XSqypWa9a4X0
+dFbD9ed1Uigspf9mR6XU/v6eVL9lfgHWMI+lNpyiUBzuOIABSMbHdPTGrMNASRZhdCyvjG817XsY
+AFs2PJxQDcqSMxDxJklt33UkN4Ii1+iW/RVLApY+B3KVfqs9TC7XyvDf4Fg/LS8EmjijAQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBpOjCl4oaTeq
+YR3r6/wtbyPk86AwDQYJKoZIhvcNAQEMBQADggIBAJaAcgkGfpzMkwQWu6A6jZJOtxEaCnFxEM0E
+rX+lRVAQZk5KQaID2RFPeje5S+LGjzJmdSX7684/AykmjbgWHfYfM25I5uj4V7Ibed87hwriZLoA
+ymzvftAj63iP/2SbNDefNWWipAA9EiOWWF3KY4fGoweITedpdopTzfFP7ELyk+OZpDc8h7hi2/Ds
+Hzc/N19DzFGdtfCXwreFamgLRB7lUe6TzktuhsHSDCRZNhqfLJGP4xjblJUK7ZGqDpncllPjYYPG
+FrojutzdfhrGe0K22VoF3Jpf1d+42kd92jjbrDnVHmtsKheMYc2xbXIBw8MgAGJoFjHVdqqGuw6q
+nsb58Nn4DSEC5MUoFlkRudlpcyqSeLiSV5sI8jrlL5WwWLdrIBRtFO8KvH7YVdiI2i/6GaX7i+B/
+OfVyK4XELKzvGUWSTLNhB9xNH27SgRNcmvMSZ4PPmz+Ln52kuaiWA3rF7iDeM9ovnhp6dB7h7sxa
+OgTdsxoEqBRjrLdHEoOabPXm6RUVkRqEGQ6UROcSjiVbgGcZ3GOTEAtlLor6CZpO2oYofaphNdgO
+pygau1LgePhsumywbrmHXumZNTfxPWQrqaA0k89jL9WB365jJ6UeTo3cKXhZ+PmhIIynJkBugnLN
+eLLIjzwec+fBH7/PzqUqm9tEZDKgu39cJRNItX+S
+-----END CERTIFICATE-----
+
+SecureSign Root CA15
+====================
+-----BEGIN CERTIFICATE-----
+MIICIzCCAamgAwIBAgIUFhXHw9hJp75pDIqI7fBw+d23PocwCgYIKoZIzj0EAwMwUTELMAkGA1UE
+BhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBMdGQuMR0wGwYDVQQDExRTZWN1
+cmVTaWduIFJvb3QgQ0ExNTAeFw0yMDA0MDgwODMyNTZaFw00NTA0MDgwODMyNTZaMFExCzAJBgNV
+BAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2Vj
+dXJlU2lnbiBSb290IENBMTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQLUHSNZDKZmbPSYAi4Io5G
+dCx4wCtELW1fHcmuS1Iggz24FG1Th2CeX2yF2wYUleDHKP+dX+Sq8bOLbe1PL0vJSpSRZHX+AezB
+2Ot6lHhWGENfa4HL9rzatAy2KZMIaY+jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT9DAKBggqhkjOPQQDAwNoADBlAjEA2S6J
+fl5OpBEHvVnCB96rMjhTKkZEBhd6zlHp4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJ
+SwdLZrWeqrqgHkHZAXQ6bkU6iYAZezKYVWOr62Nuk22rGwlgMU4=
+-----END CERTIFICATE-----

package/deps/couchbase-cxx-cache/mozilla-ca-bundle.sha256

@@ -1 +1 @@
-1bf458412568e134a4514f5e170a328d11091e071c7110955c9884ed87972ac9  cacert.pem
+189d3cf6d103185fba06d76c1af915263c6d42225481a1759e853b33ac857540  cacert.pem

package/deps/couchbase-cxx-client/CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 
 project(
   couchbase_cxx_client
-  VERSION "1.0.1"
+  VERSION "1.0.2"
   LANGUAGES CXX C)
 message(STATUS "Couchbase C++ client ${couchbase_cxx_client_VERSION} build ${couchbase_cxx_client_BUILD_NUMBER}, master: ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT}")
 message(STATUS "System: ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_VERSION}, ${CMAKE_SYSTEM_PROCESSOR}")
@@ -29,6 +29,8 @@ if(WIN32)
   message(STATUS "Windows SDK: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
 endif()
 
+include(cmake/TarballRelease.cmake OPTIONAL)
+
 include(cmake/PreventInSourceBuilds.cmake)
 include(cmake/StandardProjectSettings.cmake)
 
@@ -70,26 +72,24 @@ find_package(Threads REQUIRED)
 
 include(cmake/ThirdPartyDependencies.cmake)
 
-option(COUCHBASE_CXX_CLIENT_STATIC_STDLIB "Statically link C++ standard library" FALSE)
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-  if(COUCHBASE_CXX_CLIENT_STATIC_STDLIB)
-    target_compile_options(project_options INTERFACE -static-libgcc -static-libstdc++)
-    target_link_libraries(project_options INTERFACE -static-libgcc -static-libstdc++)
-  endif()
-endif()
-
 include(cmake/OpenSSL.cmake)
 
 include(cmake/VersionInfo.cmake)
 
-add_subdirectory(core/meta)
-add_subdirectory(core/platform)
-add_subdirectory(core/logger)
-add_subdirectory(core/crypto)
-add_subdirectory(core/sasl)
-add_subdirectory(core/tracing)
-add_subdirectory(core/metrics)
+include(cmake/DetectStandardFilesystem.cmake)
+couchbase_cxx_check_filesystem(
+  couchbase_cxx_client
+  "filesystem"
+  "std::filesystem"
+  "stdc++fs;c++fs"
+  STD_FILESYSTEM)
+if(STD_FILESYSTEM)
+  message(STATUS "Using std::filesystem")
+else()
+  message(FATAL_ERROR "Couchbase C++ Client requires C++17, including an implementation of std::filesystem.")
+endif()
 
+add_subdirectory(core/platform)
 set(couchbase_cxx_client_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx
     core/agent.cxx
@@ -103,13 +103,23 @@ set(couchbase_cxx_client_FILES
     core/cluster_agent_config.cxx
     core/cluster_options.cxx
     core/collections_component.cxx
+    core/columnar/agent.cxx
+    core/columnar/agent_config.cxx
+    core/columnar/backoff_calculator.cxx
+    core/columnar/error.cxx
+    core/columnar/error_codes.cxx
+    core/columnar/management_component.cxx
+    core/columnar/query_component.cxx
+    core/columnar/query_result.cxx
     core/config_profiles.cxx
     core/core_sdk_shim.cxx
     core/crud_component.cxx
+    core/crypto/cbcrypto.cc
     core/dispatcher.cxx
     core/document_id.cxx
     core/error_context/key_value.cxx
     core/free_form_http_request.cxx
+    core/http_component.cxx
     core/impl/analytics.cxx
     core/impl/analytics_error_category.cxx
     core/impl/analytics_index_manager.cxx
@@ -133,8 +143,8 @@ set(couchbase_cxx_client_FILES
     core/impl/disjunction_query.cxx
     core/impl/dns_srv_tracker.cxx
     core/impl/doc_id_query.cxx
-    core/impl/error_context.cxx
     core/impl/error.cxx
+    core/impl/error_context.cxx
     core/impl/expiry.cxx
     core/impl/fail_fast_retry_strategy.cxx
     core/impl/field_level_encryption_error_category.cxx
@@ -143,13 +153,13 @@ set(couchbase_cxx_client_FILES
     core/impl/geo_polygon_query.cxx
     core/impl/get_replica.cxx
     core/impl/internal_date_range_facet_result.cxx
+    core/impl/internal_error_context.cxx
     core/impl/internal_numeric_range_facet_result.cxx
     core/impl/internal_search_error_context.cxx
     core/impl/internal_search_meta_data.cxx
     core/impl/internal_search_result.cxx
     core/impl/internal_search_row.cxx
     core/impl/internal_search_row_locations.cxx
-    core/impl/internal_error_context.cxx
     core/impl/internal_term_facet_result.cxx
     core/impl/key_value_error_category.cxx
     core/impl/key_value_error_context.cxx
@@ -178,13 +188,14 @@ set(couchbase_cxx_client_FILES
     core/impl/replica_utils.cxx
     core/impl/retry_action.cxx
     core/impl/retry_reason.cxx
+    core/impl/scan_result.cxx
     core/impl/scope.cxx
     core/impl/search.cxx
     core/impl/search_error_category.cxx
     core/impl/search_index_manager.cxx
     core/impl/search_meta_data.cxx
-    core/impl/search_result.cxx
     core/impl/search_request.cxx
+    core/impl/search_result.cxx
     core/impl/search_row.cxx
     core/impl/search_row_location.cxx
     core/impl/search_row_locations.cxx
@@ -221,18 +232,19 @@ set(couchbase_cxx_client_FILES
     core/impl/vector_search.cxx
     core/impl/view_error_category.cxx
     core/impl/wildcard_query.cxx
-    core/impl/scan_result.cxx
+    core/io/config_tracker.cxx
     core/io/dns_client.cxx
     core/io/dns_config.cxx
-    core/io/http_session.cxx
     core/io/http_parser.cxx
+    core/io/http_session.cxx
     core/io/http_streaming_parser.cxx
     core/io/http_streaming_response.cxx
     core/io/mcbp_message.cxx
     core/io/mcbp_parser.cxx
     core/io/mcbp_session.cxx
-    core/io/config_tracker.cxx
     core/key_value_config.cxx
+    core/logger/custom_rotating_file_sink.cxx
+    core/logger/logger.cxx
     core/management/analytics_link_azure_blob_external.cxx
     core/management/analytics_link_couchbase_remote.cxx
     core/management/analytics_link_s3_external.cxx
@@ -246,6 +258,8 @@ set(couchbase_cxx_client_FILES
     core/mcbp/packet.cxx
     core/mcbp/queue_request.cxx
     core/mcbp/server_duration.cxx
+    core/meta/version.cxx
+    core/metrics/logging_meter.cxx
     core/n1ql_query_options.cxx
     core/operations/document_analytics.cxx
     core/operations/document_append.cxx
@@ -342,6 +356,12 @@ set(couchbase_cxx_client_FILES
     core/operations/management/view_index_get_all.cxx
     core/operations/management/view_index_upsert.cxx
     core/origin.cxx
+    core/platform/base64.cc
+    core/platform/dirutils.cc
+    core/platform/random.cc
+    core/platform/string_hex.cc
+    core/platform/terminate_handler.cc
+    core/platform/uuid.cc
     core/protocol/client_request.cxx
     core/protocol/client_response.cxx
     core/protocol/cmd_append.cxx
@@ -381,10 +401,17 @@ set(couchbase_cxx_client_FILES
     core/range_scan_orchestrator.cxx
     core/retry_orchestrator.cxx
     core/row_streamer.cxx
+    core/sasl/client.cc
+    core/sasl/context.cc
+    core/sasl/mechanism.cc
+    core/sasl/plain/plain.cc
+    core/sasl/scram-sha/scram-sha.cc
+    core/sasl/scram-sha/stringutils.cc
     core/scan_result.cxx
     core/search_query_options.cxx
     core/seed_config.cxx
     core/topology/configuration.cxx
+    core/tracing/threshold_logging_tracer.cxx
     core/transactions/active_transaction_record.cxx
     core/transactions/async_attempt_context.cxx
     core/transactions/atr_cleanup_entry.cxx
@@ -419,96 +446,113 @@ set(couchbase_cxx_client_FILES
     core/utils/split_string.cxx
     core/utils/url_codec.cxx
     core/view_query_options.cxx
-    core/http_component.cxx
-    core/columnar/agent.cxx
-    core/columnar/agent_config.cxx
-    core/columnar/error.cxx
-    core/columnar/error_codes.cxx
-    core/columnar/query_component.cxx
-    core/columnar/query_result.cxx
-    core/columnar/backoff_calculator.cxx
 )
 
+set(couchbase_cxx_client_LIBRARIES)
+set(couchbase_cxx_client_DEFAULT_LIBRARY)
+
+option(COUCHBASE_CXX_CLIENT_BUILD_STATIC "Build with static library" ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT})
+if(COUCHBASE_CXX_CLIENT_BUILD_STATIC)
+  add_library(couchbase_cxx_client_static STATIC ${couchbase_cxx_client_FILES})
+  add_library(couchbase_cxx_client::couchbase_cxx_client_static ALIAS couchbase_cxx_client_static)
+  target_compile_definitions(couchbase_cxx_client_static PRIVATE COUCHBASE_CXX_CLIENT_STATIC_TARGET)
+
+  option(COUCHBASE_CXX_CLIENT_STATIC_STDLIB "Statically link C++ standard library" FALSE)
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if(COUCHBASE_CXX_CLIENT_STATIC_STDLIB)
+      target_compile_options(couchbase_cxx_client_static PRIVATE -static-libgcc -static-libstdc++)
+      target_link_libraries(couchbase_cxx_client_static PRIVATE -static-libgcc -static-libstdc++)
+    endif()
+  endif()
+  list(APPEND couchbase_cxx_client_LIBRARIES couchbase_cxx_client_static)
+  set(couchbase_cxx_client_DEFAULT_LIBRARY couchbase_cxx_client_static)
+endif()
+
+option(COUCHBASE_CXX_CLIENT_BUILD_SHARED "Build with shared library" ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT})
 if(COUCHBASE_CXX_CLIENT_BUILD_SHARED OR BUILD_SHARED_LIBS)
   add_library(couchbase_cxx_client SHARED ${couchbase_cxx_client_FILES})
-else()
-  add_library(couchbase_cxx_client STATIC ${couchbase_cxx_client_FILES})
-endif()
-add_library(couchbase_cxx_client::couchbase_cxx_client ALIAS couchbase_cxx_client)
-set_target_properties(couchbase_cxx_client PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-target_include_directories(couchbase_cxx_client PRIVATE ${PROJECT_BINARY_DIR}/generated ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
-target_include_directories(couchbase_cxx_client PUBLIC ${PROJECT_SOURCE_DIR})
-target_include_directories(couchbase_cxx_client SYSTEM PUBLIC ${PROJECT_SOURCE_DIR}/third_party/cxx_function
-                                                              ${PROJECT_SOURCE_DIR}/third_party/expected/include)
-target_link_libraries(couchbase_cxx_client PRIVATE project_options project_warnings)
-
-if (COUCHBASE_CXX_CLIENT_CLANG_TIDY)
-  set_target_properties(couchbase_cxx_client PROPERTIES CXX_CLANG_TIDY "${COUCHBASE_CXX_CLIENT_CLANG_TIDY}")
-  message(STATUS "clang-tidy: ${COUCHBASE_CXX_CLIENT_CLANG_TIDY}")
+  add_library(couchbase_cxx_client::couchbase_cxx_client ALIAS couchbase_cxx_client)
+
+  set_target_properties(couchbase_cxx_client PROPERTIES
+      VERSION ${couchbase_cxx_client_VERSION_MAJOR}
+      SOVERSION ${couchbase_cxx_client_VERSION})
+  list(APPEND couchbase_cxx_client_LIBRARIES couchbase_cxx_client)
+  if(NOT WIN32)
+    set(couchbase_cxx_client_DEFAULT_LIBRARY couchbase_cxx_client)
+  endif()
 endif()
 
-include(cmake/DetectStandardFilesystem.cmake)
-couchbase_cxx_check_filesystem(
-  couchbase_cxx_client
-  "filesystem"
-  "std::filesystem"
-  "stdc++fs;c++fs"
-  STD_FILESYSTEM)
-if(STD_FILESYSTEM)
-  message(STATUS "Using std::filesystem")
-else()
-  message(FATAL_ERROR "Couchbase C++ Client requires C++17, including an implementation of std::filesystem.")
+if(NOT couchbase_cxx_client_DEFAULT_LIBRARY)
+  message(FATAL_ERROR "Either static or shared version of couchbase-cxx-client
+have to be selected")
 endif()
 
-target_link_libraries(
-  couchbase_cxx_client
-  PUBLIC fmt::fmt
-         spdlog::spdlog
-         couchbase_backtrace
-         couchbase_logger
-         couchbase_platform
-         couchbase_meta
-         couchbase_crypto
-         couchbase_sasl
-         couchbase_tracing
-         couchbase_metrics)
-
-target_link_libraries(
-  couchbase_cxx_client
-  PRIVATE Microsoft.GSL::GSL
-          asio
-          llhttp::llhttp
-          taocpp::json
-          snappy
-          jsonsl
-          hdr_histogram_static)
-
-if(WIN32)
-  target_link_libraries(couchbase_cxx_client PRIVATE iphlpapi)
+if(WIN32 OR NOT COUCHBASE_CXX_CLIENT_BUILD_SHARED)
+  set(COUCHBASE_CXX_CLIENT_VARIANT couchbase_cxx_client_static)
 endif()
 
-if(NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
-  if(TARGET PkgConfig::PKG_CONFIG_OPENSSL)
-    target_link_libraries(couchbase_cxx_client PUBLIC PkgConfig::PKG_CONFIG_OPENSSL)
-  else()
-    target_link_libraries(couchbase_cxx_client PUBLIC OpenSSL::SSL OpenSSL::Crypto)
-  endif()
-endif()
+foreach(TARGET ${couchbase_cxx_client_LIBRARIES})
+  set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+  target_include_directories(
+    ${TARGET} PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+                      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated>
+                      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated_$<CONFIG>>)
+
+  target_include_directories(
+    ${TARGET} SYSTEM PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/cxx_function>
+                             $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/expected/include>)
+
+  target_include_directories(${TARGET} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+  enable_sanitizers(${TARGET})
+  target_link_libraries(
+    ${TARGET}
+    PRIVATE project_options
+            project_warnings
+            fmt::fmt
+            spdlog::spdlog
+            Microsoft.GSL::GSL
+            asio
+            llhttp::llhttp
+            taocpp::json
+            snappy
+            jsonsl
+            couchbase_backtrace
+            hdr_histogram_static)
 
-if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
-  if(COUCHBASE_CXX_CLIENT_USE_BORINGSSL_PREFIX)
-    target_compile_definitions(couchbase_cxx_client PUBLIC BORINGSSL_PREFIX=${COUCHBASE_CXX_CLIENT_BORINGSSL_PREFIX})
+  if(WIN32)
+    target_link_libraries(${TARGET} PRIVATE iphlpapi)
   endif()
-  if(WIN32 AND NOT CMAKE_MSVC_RUNTIME_LIBRARY)
-    # BoringSSL uses the /MD compile flag, so we need to do the same
-    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-    message(STATUS "CMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}")
+
+  if(NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
+    if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
+      if(COUCHBASE_CXX_CLIENT_USE_BORINGSSL_PREFIX)
+        target_compile_definitions(${TARGET} PUBLIC BORINGSSL_PREFIX=${COUCHBASE_CXX_CLIENT_BORINGSSL_PREFIX})
+      endif()
+      if(WIN32 AND NOT CMAKE_MSVC_RUNTIME_LIBRARY)
+        # BoringSSL uses the /MD compile flag, so we need to do the same
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        message(STATUS "CMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}")
+      endif()
+      if(MINGW)
+        target_link_libraries(${TARGET} PUBLIC ws2_32)
+      endif()
+      target_link_libraries(${TARGET} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
+    else()
+      if(TARGET PkgConfig::PKG_CONFIG_OPENSSL)
+        target_link_libraries(${TARGET} PUBLIC PkgConfig::PKG_CONFIG_OPENSSL)
+      else()
+        target_link_libraries(${TARGET} PUBLIC OpenSSL::SSL OpenSSL::Crypto)
+      endif()
+    endif()
   endif()
-  if(MINGW)
-    target_link_libraries(couchbase_cxx_client PUBLIC ws2_32)
+
+  if(COUCHBASE_CXX_CLIENT_CLANG_TIDY)
+    set_target_properties(${TARGET} PROPERTIES CXX_CLANG_TIDY "${COUCHBASE_CXX_CLIENT_CLANG_TIDY}")
+    message(STATUS "clang-tidy: ${COUCHBASE_CXX_CLIENT_CLANG_TIDY}")
   endif()
-endif()
+endforeach()
 
 option(COUCHBASE_CXX_CLIENT_BUILD_TESTS "Build test programs" ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT})
 if(COUCHBASE_CXX_CLIENT_BUILD_TESTS)
@@ -530,4 +574,7 @@ if(COUCHBASE_CXX_CLIENT_BUILD_TOOLS)
   add_subdirectory(tools)
 endif()
 
-include(cmake/Packaging.cmake)
+option(COUCHBASE_CXX_CLIENT_INSTALL "Install library" OFF)
+if(COUCHBASE_CXX_CLIENT_INSTALL)
+  include(cmake/Packaging.cmake)
+endif()

package/deps/couchbase-cxx-client/README.md

@@ -21,15 +21,29 @@ CPMAddPackage(
   NAME
   couchbase_cxx_client
   GIT_TAG
-  1.0.1
+  1.0.2
   VERSION
-  1.0.1
+  1.0.2
   GITHUB_REPOSITORY
   "couchbase/couchbase-cxx-client"
   OPTIONS
   "COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL ON")
 ```
 
+In case the library installed in the system using `install` target or package
+management system, `FindPackage` could be used:
+
+```cmake
+cmake_minimum_required(VERSION 3.19)
+
+project(minimal)
+
+find_package(couchbase_cxx_client REQUIRED)
+
+add_executable(minimal minimal.cxx)
+target_link_libraries(minimal PRIVATE couchbase_cxx_client::couchbase_cxx_client)
+```
+
 ## Building with CMake
 
 This repo is being built with `CMake` so everything should build easily once the