From b14bfd2aad3ef730bf9e4e50b4ab0997b2f5b6ef Mon Sep 17 00:00:00 2001 From: kornes <28986062+kornes@users.noreply.github.com> Date: Sat, 21 May 2022 15:38:10 +0000 Subject: [PATCH] Fix vcpkg manifest and finding RapidJSON and Websocketpp modules (#3753) Co-authored-by: pajlada --- cmake/FindRapidJSON.cmake | 8 ++++---- cmake/FindWebsocketpp.cmake | 8 ++++---- vcpkg.json | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cmake/FindRapidJSON.cmake b/cmake/FindRapidJSON.cmake index 9c58df19e..57ec5b638 100644 --- a/cmake/FindRapidJSON.cmake +++ b/cmake/FindRapidJSON.cmake @@ -1,14 +1,14 @@ include(FindPackageHandleStandardArgs) -find_path(RapidJSON_INCLUDE_DIRS rapidjson/rapidjson.h HINTS ${CMAKE_SOURCE_DIR}/lib/rapidjson/include) +find_path(RapidJSON_INCLUDE_DIR rapidjson/rapidjson.h HINTS ${CMAKE_SOURCE_DIR}/lib/rapidjson/include) -find_package_handle_standard_args(RapidJSON DEFAULT_MSG RapidJSON_INCLUDE_DIRS) +find_package_handle_standard_args(RapidJSON DEFAULT_MSG RapidJSON_INCLUDE_DIR) if (RapidJSON_FOUND) add_library(RapidJSON::RapidJSON INTERFACE IMPORTED) set_target_properties(RapidJSON::RapidJSON PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${RapidJSON_INCLUDE_DIRS}" + INTERFACE_INCLUDE_DIRECTORIES "${RapidJSON_INCLUDE_DIR}" ) endif () -mark_as_advanced(RapidJSON_INCLUDE_DIRS) +mark_as_advanced(RapidJSON_INCLUDE_DIR) diff --git a/cmake/FindWebsocketpp.cmake b/cmake/FindWebsocketpp.cmake index 47e68edb4..f8d0bb658 100644 --- a/cmake/FindWebsocketpp.cmake +++ b/cmake/FindWebsocketpp.cmake @@ -1,14 +1,14 @@ include(FindPackageHandleStandardArgs) -find_path(Websocketpp_INCLUDE_DIRS websocketpp/version.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/websocketpp) +find_path(Websocketpp_INCLUDE_DIR websocketpp/version.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/websocketpp) -find_package_handle_standard_args(Websocketpp DEFAULT_MSG Websocketpp_INCLUDE_DIRS) +find_package_handle_standard_args(Websocketpp DEFAULT_MSG Websocketpp_INCLUDE_DIR) if (Websocketpp_FOUND) add_library(websocketpp::websocketpp INTERFACE IMPORTED) set_target_properties(websocketpp::websocketpp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${Websocketpp_INCLUDE_DIRS}" + INTERFACE_INCLUDE_DIRECTORIES "${Websocketpp_INCLUDE_DIR}" ) endif () -mark_as_advanced(Websocketpp_INCLUDE_DIRS) +mark_as_advanced(Websocketpp_INCLUDE_DIR) diff --git a/vcpkg.json b/vcpkg.json index aea44f56e..31da7aa23 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -5,6 +5,7 @@ "dependencies": [ "benchmark", "boost-asio", + "boost-signals2", "boost-foreach", "boost-interprocess", "boost-random", @@ -14,8 +15,10 @@ "qt5-multimedia", "qt5-tools" ], - "builtin-baseline": "2ac61f87f69f0484b8044f95ab274038fbaf7bdd", + "builtin-baseline": "8da5d2b4503b3100b6b7bb26ffeeefd0e8a25799", "overrides": [ - { "name": "openssl", "version-string": "1.1.1n" } + { + "name": "openssl", "version-string": "1.1.1n" + } ] }