Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sleepy-discord] fix [core] build #20372

Merged
merged 1 commit into from
Sep 29, 2021
Merged

[sleepy-discord] fix [core] build #20372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/sleepy-discord/fix-boost.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/sleepy_discord/CMakeLists.txt b/sleepy_discord/CMakeLists.txt
index 6c134141..2d115985 100644
--- a/sleepy_discord/CMakeLists.txt
+++ b/sleepy_discord/CMakeLists.txt
@@ -84,7 +84,7 @@ if (NOT ONLY_SLEEPY_DISCORD)
elseif(USE_BOOST_ASIO)
#Look for boost as an alt
find_package(Boost REQUIRED)
- list(APPEND LIBRARIES_TO_LINK ${Boost_LIBRARIES})
+ list(APPEND LIBRARIES_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}")
list(APPEND LIB_CONFIG "EXISTENT_BOOST_ASIO")
list(APPEND LIB_CONFIG "EXISTENT_ASIO")
list(APPEND REQUIRED_PACKAGES "Boost")
6 changes: 4 additions & 2 deletions ports/sleepy-discord/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"websocketpp" USE_WEBSOCKETPP
"websocketpp" USE_BOOST_ASIO
PhoebeHui marked this conversation as resolved.
Show resolved Hide resolved
"cpr" USE_CPR
"voice" ENABLE_VOICE
"compression" USE_ZLIB
Expand All @@ -13,6 +12,8 @@ vcpkg_from_github(
REF 53e68d6a569ab6da17b74279e308bf94919db933
SHA512 1ee6de7aa70f3d7fc6ec0e21f5e65c6a868c23a29b4f26f614b59bbce3425c1305ce192562bf287d40f98060301b8638bc4bef95789fe8594ce5809adb6dc1e5
HEAD_REF develop
PATCHES
fix-boost.patch
)

# Handle version data here to prevent issues from doing this twice in parallel
Expand All @@ -32,12 +33,13 @@ vcpkg_cmake_configure(
OPTIONS
-DSLEEPY_VCPKG=ON
-DAUTO_DOWNLOAD_LIBRARY=OFF
-DUSE_BOOST_ASIO=ON
PhoebeHui marked this conversation as resolved.
Show resolved Hide resolved
${FEATURE_OPTIONS}
)
vcpkg_cmake_install()

vcpkg_copy_pdbs()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sleepy-discord)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleepy-discord)

file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
6 changes: 6 additions & 0 deletions ports/sleepy-discord/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
{
"name": "sleepy-discord",
"version-date": "2021-07-07",
"port-version": 1,
"description": "C++ library for the Discord chat client",
"homepage": "https://yourwaifu.dev/sleepy-discord/",
"dependencies": [
"boost-asio",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"default-features": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6082,7 +6082,7 @@
},
"sleepy-discord": {
"baseline": "2021-07-07",
"port-version": 0
"port-version": 1
},
"slikenet": {
"baseline": "2021-06-07",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sleepy-discord.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0aba637e01389ec4ed5923eaf898ca78dac96cbb",
"version-date": "2021-07-07",
"port-version": 1
},
{
"git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda",
"version-date": "2021-07-07",
Expand Down