Update core to 1.0.2

couchbase · Sep 23, 2024 · ec5d2bb · ec5d2bb
1 parent a90168e
commit ec5d2bb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/config.w32 b/config.w32
@@ -73,6 +73,9 @@ if (PHP_COUCHBASE != "no") {
         ' -D COUCHBASE_PHP_INCLUDES="' + COUCHBASE_PHP_INCLUDES + '"' +
         ' -D COUCHBASE_PHP_LIB="' + COUCHBASE_PHP_LIB + '"' +
         ' -D COUCHBASE_PHP_LIBDIR="' + get_define("BUILD_DIR") + '"' +
+        ' -D COUCHBASE_CXX_CLIENT_INSTALL=OFF ' +
+        ' -D COUCHBASE_CXX_CLIENT_BUILD_SHARED=OFF ' +
+        ' -D COUCHBASE_CXX_CLIENT_BUILD_STATIC=OON ' +
         ' -D COUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF ' +
         ' -D COUCHBASE_CXX_CLIENT_BUILD_TOOLS=OFF ' +
         ' -D COUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF ' +

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -23,12 +23,16 @@ set(COUCHBASE_CXX_CLIENT_BUILD_TESTS
 set(COUCHBASE_CXX_CLIENT_BUILD_TOOLS
     OFF
     CACHE BOOL "" FORCE)
+set(COUCHBASE_CXX_CLIENT_BUILD_STATIC
+    ON
+    CACHE BOOL "" FORCE)
 set(COUCHBASE_CXX_CLIENT_BUILD_SHARED
     OFF
     CACHE BOOL "" FORCE)
 set(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL
     ON
     CACHE BOOL "" FORCE)
+set(COUCHBASE_CXX_CLIENT_INSTALL OFF CACHE BOOL "" FORCE)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_subdirectory(deps/couchbase-cxx-client)
@@ -83,16 +87,19 @@ endif()
 if(MSVC)
   set_target_properties(couchbase PROPERTIES PREFIX "php_" IMPORT_PREFIX "php_")
 endif()
-target_include_directories(couchbase PRIVATE ${PROJECT_BINARY_DIR}/generated)
-target_include_directories(couchbase PRIVATE ${PROJECT_SOURCE_DIR}/deps/couchbase-cxx-client)
-target_include_directories(couchbase PRIVATE ${PHP_INCLUDE_DIRS})
+target_include_directories(couchbase SYSTEM PRIVATE
+    ${PHP_INCLUDE_DIRS}
+    ${PROJECT_BINARY_DIR}/generated
+    ${PROJECT_SOURCE_DIR}/deps/couchbase-cxx-client
+    ${PROJECT_SOURCE_DIR}/deps/couchbase-cxx-client/third_party/cxx_function
+    ${PROJECT_SOURCE_DIR}/deps/couchbase-cxx-client/third_party/expected/include)
 target_compile_definitions(couchbase PRIVATE ZEND_COMPILE_DL_EXT=1)
-set_target_properties(couchbase_cxx_client PROPERTIES C_VISIBILITY_PRESET hidden CXX_VISIBILITY_PRESET hidden)
+set_target_properties(couchbase_cxx_client_static PROPERTIES C_VISIBILITY_PRESET hidden CXX_VISIBILITY_PRESET hidden)
 target_link_libraries(
   couchbase
   PRIVATE project_options
           project_warnings
-          couchbase_cxx_client
+          couchbase_cxx_client_static
           spdlog::spdlog
           taocpp::json
           fmt::fmt

diff --git a/src/deps/couchbase-cxx-client b/src/deps/couchbase-cxx-client
diff --git a/src/wrapper/connection_handle.cxx b/src/wrapper/connection_handle.cxx
@@ -44,6 +44,7 @@
 #include <core/utils/json.hxx>
 
 #include <couchbase/cluster.hxx>
+#include <couchbase/codec/tao_json_serializer.hxx>
 #include <couchbase/collection.hxx>
 #include <couchbase/mutation_token.hxx>
 #include <couchbase/retry_reason.hxx>
@@ -6015,7 +6016,6 @@ apply_options(couchbase::cluster_options& cluster_options, zval* options)
 
       options::assign_string("network", key, value, [&](auto v) {
         cluster_options.network().preferred_network(v);
-        cluster_options.behavior().network(v);
       });
 
       options::assign_string("trustCertificate", key, value, [&](auto v) {