From 2cb1f12db1cb3539ab9364581d9e4ed174d3fe5b Mon Sep 17 00:00:00 2001 From: Sergey Avseyev Date: Tue, 12 Nov 2024 14:12:57 -0800 Subject: [PATCH] PCBC-1017: Update core and user agent generation --- src/CMakeLists.txt | 6 ++++++ src/deps/couchbase-cxx-client | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b956e4af..d93e58a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,6 +11,12 @@ set(CMAKE_C_STANDARD 99) include(${PROJECT_SOURCE_DIR}/cmake/pecl_package.cmake OPTIONAL) +file(READ "${PROJECT_SOURCE_DIR}/php_couchbase.hxx" FILE_CONTENT) +string(REGEX MATCH "PHP_COUCHBASE_VERSION +\"([0-9]+\\.[0-9]+\\.[0-9]+)\"" EXT_VERSION ${FILE_CONTENT}) + +set(COUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID + "php/${CMAKE_MATCH_1}" + CACHE STRING "" FORCE) set(COUCHBASE_CXX_CLIENT_BUILD_DOCS OFF CACHE BOOL "" FORCE) diff --git a/src/deps/couchbase-cxx-client b/src/deps/couchbase-cxx-client index b7086c05..c24912fc 160000 --- a/src/deps/couchbase-cxx-client +++ b/src/deps/couchbase-cxx-client @@ -1 +1 @@ -Subproject commit b7086c059659d3f1e03a8d9bff266fad0c6c9b89 +Subproject commit c24912fcbbec5c5ebe3c2b54bb3013300ae69ed7