chatterino2
Code Issues

Fix vcpkg manifest and finding RapidJSON and Websocketpp modules (#3753)

Browse Source 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
kornes
2022-05-21 15:38:10 +00:00
committed by GitHub
parent 523e0c5ef4
commit b14bfd2aad
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/FindRapidJSON.cmake
+4 -4
View File
@@ -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)
cmake/FindWebsocketpp.cmake
+4 -4
View File
@@ -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)
vcpkg.json
+5 -2
View File
@@ -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"
}
]
}