JSCBC-1358: Update SDK Build Setup

thejcfactor · thejcfactor · commit 0ecc78055e98 · 2025-09-05T19:15:56.000Z
Changes ======= * Update C++ Core * Update CMakeLists.txt to handle C++ core changes Change-Id: I4445b0b33faa9d15e33231329e06ba42fd1d0356 Reviewed-on: https://review.couchbase.org/c/couchnode/+/232812 Reviewed-by: Mateusz <matt.wozakowski@couchbase.com> Tested-by: Jared Casey <jared.casey@couchbase.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,6 +140,7 @@ if(CMAKE_JS_VERSION VERSION_GREATER_EQUAL "7.0.0")
 else()
   set(NODEJS_INC_DIR "${CMAKE_JS_INC}")
 endif()
+list(REMOVE_DUPLICATES NODEJS_INC_DIR)
 
 message(STATUS "NODEJS_INC_DIR=${NODEJS_INC_DIR}")
 message(STATUS "NODEJS_LIB=${NODEJS_LIB}")
@@ -151,7 +152,7 @@ if(WIN32)
 endif()
 
 # We need to import headers globally for our dependant libraries such as couchbase-cxx-client.
-include_directories(${NODEJS_INC_DIR})
+include_directories(SYSTEM ${NODEJS_INC_DIR})
 
 get_couchnode_version()
 message(STATUS "COUCHNODE_VERSION=${COUCHNODE_VERSION}")
@@ -229,7 +230,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 
 target_link_libraries(${PROJECT_NAME}
   ${NODEJS_LIB}
-  couchbase_cxx_client::couchbase_cxx_client_static
+  couchbase_cxx_client_static_intermediate
   asio
   Microsoft.GSL::GSL
   taocpp::json
diff --git a/deps/couchbase-cxx-client b/deps/couchbase-cxx-client
@@ -1 +1 @@
-Subproject commit b80886d6b4a75c604d26a4b54252a1e78db42297
+Subproject commit b2e9980db90cd55e65207253aef72009bb987b1b
