noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/FindRapidJSON.cmake
View file

@ -1,14 +1,14 @@
include(FindPackageHandleStandardArgs) 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) if (RapidJSON_FOUND)
add_library(RapidJSON::RapidJSON INTERFACE IMPORTED) add_library(RapidJSON::RapidJSON INTERFACE IMPORTED)
set_target_properties(RapidJSON::RapidJSON PROPERTIES set_target_properties(RapidJSON::RapidJSON PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${RapidJSON_INCLUDE_DIRS}" INTERFACE_INCLUDE_DIRECTORIES "${RapidJSON_INCLUDE_DIR}"
) )
endif () endif ()
mark_as_advanced(RapidJSON_INCLUDE_DIRS) mark_as_advanced(RapidJSON_INCLUDE_DIR)

8
cmake/FindWebsocketpp.cmake
View file

@ -1,14 +1,14 @@
include(FindPackageHandleStandardArgs) 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) if (Websocketpp_FOUND)
add_library(websocketpp::websocketpp INTERFACE IMPORTED) add_library(websocketpp::websocketpp INTERFACE IMPORTED)
set_target_properties(websocketpp::websocketpp PROPERTIES set_target_properties(websocketpp::websocketpp PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Websocketpp_INCLUDE_DIRS}" INTERFACE_INCLUDE_DIRECTORIES "${Websocketpp_INCLUDE_DIR}"
) )
endif () endif ()
mark_as_advanced(Websocketpp_INCLUDE_DIRS) mark_as_advanced(Websocketpp_INCLUDE_DIR)

7
vcpkg.json
View file

@ -5,6 +5,7 @@
"dependencies": [ "dependencies": [
"benchmark", "benchmark",
"boost-asio", "boost-asio",
"boost-signals2",
"boost-foreach", "boost-foreach",
"boost-interprocess", "boost-interprocess",
"boost-random", "boost-random",
@ -14,8 +15,10 @@
"qt5-multimedia", "qt5-multimedia",
"qt5-tools" "qt5-tools"
], ],
"builtin-baseline": "2ac61f87f69f0484b8044f95ab274038fbaf7bdd", "builtin-baseline": "8da5d2b4503b3100b6b7bb26ffeeefd0e8a25799",
"overrides": [ "overrides": [
{ "name": "openssl", "version-string": "1.1.1n" } {
"name": "openssl", "version-string": "1.1.1n"
}
] ]
} }