Skip to content

Commit

Permalink
Update vcpkg to 2024.02.14
Browse files Browse the repository at this point in the history
* 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

microsoft/vcpkg#38980

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

apache/arrow#42027

* Avoid fmt 11 due to a bug for MSVC

gabime/spdlog#3251 (comment)

* Remove obsolete GRPC config in top-level CMake
* Avoid pinning of Protobuf
  • Loading branch information
magnesj authored Jan 19, 2025
1 parent c13ce39 commit d17ecc4
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 49 deletions.
32 changes: 0 additions & 32 deletions ApplicationExeCode/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion GrpcInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion ThirdParty/vcpkg
Submodule vcpkg updated 7212 files
10 changes: 5 additions & 5 deletions vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
26 changes: 16 additions & 10 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}

0 comments on commit d17ecc4

Please sign in to comment.