Update vcpkg to 2024.02.14

* Update vcpkg to 2024.02.14 Release

A blank install of vcpkg did not work anymore due to changes in upstream repos. Had to update vcpkg.exe to latest to ensure download of libraries works as expected.

Had to update baseline to 2024.02.14 to be able to compile on VS 17.12. A bug related to naming of boost was fixed in boost 1.84

https://github.com/microsoft/vcpkg/issues/38980

* Bump to a more recent vcpkg due to a build error in arrow

https://github.com/apache/arrow/issues/42027

* Avoid fmt 11 due to a bug for MSVC

https://github.com/gabime/spdlog/issues/3251#issue-2648376977

* Remove obsolete GRPC config in top-level CMake
* Avoid pinning of Protobuf
This commit is contained in:
Magne Sjaastad 2025-01-19 16:16:09 +01:00 committed by GitHub
parent c13ce39b5e
commit d17ecc4345
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 49 deletions

View File

@ -75,38 +75,6 @@ if(RESINSIGHT_ENABLE_GRPC)
RiaGrpcGuiApplication.h
)
# Find Protobuf installation Looks for protobuf-config.cmake file installed by
# Protobuf's cmake installation.
set(protobuf_MODULE_COMPATIBLE ON)
find_package(Protobuf CONFIG 3.0 QUIET)
if(Protobuf_FOUND)
# Find gRPC installation Looks for gRPCConfig.cmake file installed by gRPC's
# cmake installation.
find_package(gRPC CONFIG REQUIRED)
set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)
set(_GRPC_GRPCPP_UNSECURE gRPC::grpc++_unsecure gRPC::grpc_unsecure
gRPC::gpr
)
set(GRPC_LINK_LIBRARIES ${_GRPC_GRPCPP_UNSECURE} ${_PROTOBUF_LIBPROTOBUF})
else()
set(RESINSIGHT_GRPC_INSTALL_PREFIX
""
CACHE PATH "gRPC : Install prefix for gRPC"
)
set(ENV{PKG_CONFIG_PATH} "${RESINSIGHT_GRPC_INSTALL_PREFIX}/lib/pkgconfig")
find_package(PkgConfig REQUIRED)
pkg_check_modules(
GRPC
REQUIRED
grpc
grpc++_unsecure>=1.20
grpc_unsecure
gpr
protobuf
libcares
)
endif()
endif()
list(APPEND CPP_SOURCES ${CODE_SOURCE_FILES})

View File

@ -56,7 +56,7 @@ set(SOURCE_GROUP_SOURCE_FILES
# Find Protobuf installation Looks for protobuf-config.cmake file installed by
# Protobuf's cmake installation.
set(protobuf_MODULE_COMPATIBLE ON)
find_package(Protobuf CONFIG 3.0 QUIET)
find_package(Protobuf CONFIG QUIET)
if(Protobuf_FOUND)
message(STATUS "Using protobuf ${protobuf_VERSION}")

2
ThirdParty/vcpkg vendored

@ -1 +1 @@
Subproject commit a42af01b72c28a8e1d7b48107b33e4f286a55ef6
Subproject commit cf035d9916a0a23042b41fcae7ee0386d245af08

View File

@ -1,9 +1,9 @@
{
"default-registry": {
"kind": "git",
"baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6",
"repository": "https://github.com/microsoft/vcpkg"
},
"default-registry": {
"kind": "git",
"baseline": "6f29f12e82a8293156836ad81cc9bf5af41fe836",
"repository": "https://github.com/microsoft/vcpkg"
},
"registries": [
{
"kind": "artifact",

View File

@ -1,12 +1,18 @@
{
"dependencies": [
"arrow",
"boost-filesystem",
"boost-spirit",
"eigen3",
"grpc",
"type-lite",
"fast-float",
"spdlog"
]
"dependencies": [
"arrow",
"boost-filesystem",
"boost-spirit",
"eigen3",
"grpc",
"type-lite",
"fast-float",
"spdlog"
],
"overrides": [
{
"name": "fmt",
"version": "10.1.1"
}
]
}