update dependencies (#619)

fmtlib now conditionally injects /utf-8, which breaks our build_info generator. Instead we disable FMT_UNICODE for dependencies, and instead enable this flag in our scripts. The effect is the same, but more consistent. This patch also makes it more clean for multi-config builds (now build_info.hxx generated for each configuration independently)
couchbase · Jul 8, 2024 · f0c530d · f0c530d
1 parent 3155d04
commit f0c530d
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -428,7 +428,7 @@ 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)
+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} ${PROJECT_SOURCE_DIR}/private)
 target_include_directories(couchbase_cxx_client SYSTEM PUBLIC ${PROJECT_SOURCE_DIR}/third_party/cxx_function
                                                               ${PROJECT_SOURCE_DIR}/third_party/expected/include)

diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
@@ -31,6 +31,7 @@ function(set_project_warnings project_name)
       /w14906 # string literal cast to 'LPWSTR'
       /w14928 # illegal copy-initialization; more than one user-defined conversion has been implicitly applied
       /permissive- # standards conformance mode for MSVC compiler.
+      /utf-8  # enable Unicode support
   )
 
   set(COMMON_WARNINGS

diff --git a/cmake/StandardProjectSettings.cmake b/cmake/StandardProjectSettings.cmake
@@ -31,7 +31,7 @@ if(ENABLE_IPO)
   endif()
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" AND NOT WIN32)
   add_compile_options(-fcolor-diagnostics)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT MINGW)
   add_compile_options(-fdiagnostics-color=always)

diff --git a/cmake/Testing.cmake b/cmake/Testing.cmake
@@ -21,7 +21,8 @@ set_property(GLOBAL PROPERTY COUCHBASE_INTEGRATION_TESTS "")
 
 macro(integration_test name)
   add_executable(test_integration_${name} "${PROJECT_SOURCE_DIR}/test/test_integration_${name}.cxx")
-  target_include_directories(test_integration_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated)
+  target_include_directories(test_integration_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
+                                                              ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
   target_link_libraries(
     test_integration_${name}
     project_options
@@ -60,7 +61,8 @@ set_property(GLOBAL PROPERTY COUCHBASE_TRANSACTION_TESTS "")
 
 macro(transaction_test name)
   add_executable(test_transaction_${name} "${PROJECT_SOURCE_DIR}/test/test_transaction_${name}.cxx")
-  target_include_directories(test_transaction_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated)
+  target_include_directories(test_transaction_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
+                                                              ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
   target_link_libraries(
     test_transaction_${name}
     project_options
@@ -98,7 +100,8 @@ define_property(
 set_property(GLOBAL PROPERTY COUCHBASE_UNIT_TESTS "")
 macro(unit_test name)
   add_executable(test_unit_${name} "${PROJECT_SOURCE_DIR}/test/test_unit_${name}.cxx")
-  target_include_directories(test_unit_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated)
+  target_include_directories(test_unit_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
+                                                       ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
   target_link_libraries(
     test_unit_${name}
     project_options
@@ -136,7 +139,8 @@ define_property(
 set_property(GLOBAL PROPERTY COUCHBASE_BENCHMARKS "")
 macro(integration_benchmark name)
   add_executable(benchmark_integration_${name} "${PROJECT_SOURCE_DIR}/test/benchmark_integration_${name}.cxx")
-  target_include_directories(benchmark_integration_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated)
+  target_include_directories(benchmark_integration_${name} PRIVATE ${PROJECT_BINARY_DIR}/generated
+                                                                   ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
   target_link_libraries(
     benchmark_integration_${name}
     project_options

diff --git a/cmake/ThirdPartyDependencies.cmake b/cmake/ThirdPartyDependencies.cmake
@@ -21,12 +21,16 @@ if(NOT TARGET fmt::fmt)
     NAME
     fmt
     GIT_TAG
-    10.2.1
+    11.0.1
     VERSION
-    10.2.1
+    11.0.1
     GITHUB_REPOSITORY
     "fmtlib/fmt"
     OPTIONS
+    # Unicode support for MSVC enabled in CompilerWarnings.cmake
+    "FMT_UNICODE OFF"
+    "FMT_DOC OFF"
+    "FMT_INSTALL OFF"
     "BUILD_SHARED_LIBS OFF"
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
@@ -39,7 +43,7 @@ if(NOT TARGET spdlog::spdlog)
     NAME
     spdlog
     VERSION
-    1.13.0
+    1.14.1
     GITHUB_REPOSITORY
     "gabime/spdlog"
     OPTIONS
@@ -92,9 +96,9 @@ if(NOT TARGET llhttp::llhttp)
     NAME
     llhttp
     GIT_TAG
-    release/v9.2.0
+    release/v9.2.1
     VERSION
-    9.2.0
+    9.2.1
     GITHUB_REPOSITORY
     "nodejs/llhttp"
     OPTIONS
@@ -111,9 +115,9 @@ if(NOT TARGET snappy)
     NAME
     snappy
     GIT_TAG
-    1.1.10
+    1.2.1
     VERSION
-    1.1.10
+    1.2.1
     GITHUB_REPOSITORY
     "google/snappy"
     OPTIONS
@@ -154,14 +158,14 @@ if(NOT TARGET taocpp::json)
 endif()
 
 if(NOT TARGET asio::asio)
-  # https://github.com/chriskohlhoff/asio
+  # https://github.com/chriskohlhoff/asio/tags
   cpmaddpackage(
     NAME
     asio
     GIT_TAG
-    asio-1-29-0
+    asio-1-30-2
     VERSION
-    1.29.0
+    1.30.2
     GITHUB_REPOSITORY
     "chriskohlhoff/asio")
 endif()

diff --git a/cmake/VersionInfo.cmake b/cmake/VersionInfo.cmake
@@ -63,7 +63,7 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/build_config.hxx.in
 
 file(
   GENERATE
-  OUTPUT ${PROJECT_BINARY_DIR}/generated/couchbase/build_info.hxx
+  OUTPUT ${PROJECT_BINARY_DIR}/generated_$<CONFIG>/couchbase/build_info.hxx
   CONTENT
     "
 #pragma once
@@ -87,8 +87,8 @@ file(
 #define OPENSSL_PKG_CONFIG_INTERFACE_INCLUDE_DIRECTORIES \"$<$<TARGET_EXISTS:PkgConfig::PKG_CONFIG_OPENSSL>:$<TARGET_PROPERTY:PkgConfig::PKG_CONFIG_OPENSSL,INTERFACE_INCLUDE_DIRECTORIES>>\"
 #define OPENSSL_PKG_CONFIG_INTERFACE_LINK_LIBRARIES \"$<$<TARGET_EXISTS:PkgConfig::PKG_CONFIG_OPENSSL>:$<TARGET_PROPERTY:PkgConfig::PKG_CONFIG_OPENSSL,INTERFACE_LINK_LIBRARIES>>\"
 
-#define CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\"
+#define CMAKE_BUILD_TYPE \"$<CONFIG>\"
 #define CMAKE_VERSION \"${CMAKE_VERSION}\"
 
-#define COUCHBASE_CXX_CLIENT_DEBUG_BUILD $<STREQUAL:$<UPPER_CASE:\"${CMAKE_BUILD_TYPE}\">,\"DEBUG\">
+#define COUCHBASE_CXX_CLIENT_DEBUG_BUILD $<STREQUAL:$<UPPER_CASE:$<CONFIG>>,DEBUG>
 ")
diff --git a/core/mcbp/operation_queue.cxx b/core/mcbp/operation_queue.cxx
@@ -26,6 +26,7 @@
 #include <fmt/core.h>
 
 #include <algorithm>
+#include <iterator>
 #include <memory>
 
 namespace couchbase::core::mcbp

diff --git a/core/mcbp/packet.cxx b/core/mcbp/packet.cxx
@@ -25,6 +25,8 @@
 #include <fmt/core.h>
 #include <spdlog/fmt/bin_to_hex.h>
 
+#include <iterator>
+
 namespace couchbase::core::mcbp
 {
 auto

diff --git a/core/meta/CMakeLists.txt b/core/meta/CMakeLists.txt
@@ -11,7 +11,9 @@ target_link_libraries(
           taocpp::json
           fmt::fmt
           spdlog::spdlog)
-target_include_directories(couchbase_meta PRIVATE ${PROJECT_BINARY_DIR}/generated ${PROJECT_SOURCE_DIR}
+target_include_directories(couchbase_meta PRIVATE ${PROJECT_BINARY_DIR}/generated
+                                                  ${PROJECT_BINARY_DIR}/generated_$<CONFIG>
+                                                  ${PROJECT_SOURCE_DIR}
                                                   ${hdr_histogram_SOURCE_DIR}/include)
 
 if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL AND COUCHBASE_CXX_CLIENT_USE_BORINGSSL_PREFIX)

diff --git a/core/metrics/CMakeLists.txt b/core/metrics/CMakeLists.txt
@@ -10,5 +10,7 @@ target_link_libraries(
           fmt::fmt
           taocpp::json
           spdlog::spdlog)
-target_include_directories(couchbase_metrics PRIVATE ${PROJECT_BINARY_DIR}/generated ${PROJECT_SOURCE_DIR}
+target_include_directories(couchbase_metrics PRIVATE ${PROJECT_BINARY_DIR}/generated
+                                                     ${PROJECT_BINARY_DIR}/generated_$<CONFIG>
+                                                     ${PROJECT_SOURCE_DIR}
                                                      ${PROJECT_SOURCE_DIR}/third_party/hdr_histogram_c/src)
diff --git a/core/tracing/CMakeLists.txt b/core/tracing/CMakeLists.txt
@@ -9,4 +9,6 @@ target_link_libraries(
           taocpp::json
           fmt::fmt
           spdlog::spdlog)
-target_include_directories(couchbase_tracing PRIVATE ${PROJECT_BINARY_DIR}/generated ${PROJECT_SOURCE_DIR})
+target_include_directories(couchbase_tracing PRIVATE ${PROJECT_BINARY_DIR}/generated
+                                                     ${PROJECT_BINARY_DIR}/generated_$<CONFIG>
+                                                     ${PROJECT_SOURCE_DIR})
diff --git a/couchbase-sdk-cxx-black-duck-manifest.yaml b/couchbase-sdk-cxx-black-duck-manifest.yaml
@@ -5,10 +5,10 @@ components:
     versions: [ 20200921 ]
   fmt:
     bd-id: eae20828-18b8-478f-83b3-4a058748a28b
-    versions: [ 10.2.1 ]
+    versions: [ 11.0.1 ]
   spdlog:
     bd-id: 7785114c-5b78-4aad-8771-72a739a1f06e
-    versions: [ v1.13.0 ]
+    versions: [ v1.14.1 ]
   gsl:
     bd-id: 9e753ffd-aa29-46e6-a7fc-d4b972710c0b
     versions: [ 4.0.0 ]
@@ -17,13 +17,13 @@ components:
     versions: [ 0.11.8 ]
   llhttp:
     bd-id: 0bcb0de9-f810-47e1-826b-4c3696a0c276
-    versions: [ v9.2.0 ]
+    versions: [ v9.2.1 ]
   snappy:
     bd-id: fd5e5c60-2c67-4d20-8be9-b7648156cef3
-    versions: [ 1.1.10 ]
+    versions: [ 1.2.1 ]
   asio:
     bd-id: 3739d5e9-9ad8-4845-8077-1770167a69c2
-    versions: [ 1.29.0 ]
+    versions: [ 1.30.2 ]
   json:
     bd-id: cae0f7d2-4279-473a-9f71-eabdd121d2e3
     versions: [ 1.0.0-beta.14 ]
diff --git a/test/test_integration_examples.cxx b/test/test_integration_examples.cxx
@@ -36,6 +36,7 @@
 #include <tao/json.hpp>
 
 #include <fmt/chrono.h>
+#include <fmt/ranges.h>
 
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -665,6 +666,7 @@ namespace example_fork
 #include <couchbase/fmt/cas.hxx>
 #include <couchbase/fmt/mutation_token.hxx>
 
+#include <fmt/ranges.h>
 #include <tao/json.hpp>
 
 #include <sys/wait.h>

diff --git a/test/utils/test_data.cxx b/test/utils/test_data.cxx
@@ -18,6 +18,7 @@
 #include "core/mcbp/big_endian.hxx"
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 
 #include <chrono>
 #include <filesystem>

diff --git a/tools/beam.cxx b/tools/beam.cxx
@@ -28,6 +28,7 @@
 #include <couchbase/fmt/retry_reason.hxx>
 
 #include <fmt/chrono.h>
+#include <fmt/ranges.h>
 
 #include <csignal>