[sleepy-discord] fix [core] build

microsoft · Sep 26, 2021 · 4e66c94 · 4e66c94
1 parent 59a3f35
commit 4e66c94
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/ports/sleepy-discord/fix-boost.patch b/ports/sleepy-discord/fix-boost.patch
@@ -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")
diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake
@@ -1,7 +1,6 @@
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         "websocketpp"    USE_WEBSOCKETPP
-        "websocketpp"    USE_BOOST_ASIO
         "cpr"            USE_CPR
         "voice"          ENABLE_VOICE
         "compression"    USE_ZLIB
@@ -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
@@ -32,12 +33,13 @@ vcpkg_cmake_configure(
     OPTIONS 
         -DSLEEPY_VCPKG=ON 
         -DAUTO_DOWNLOAD_LIBRARY=OFF 
+        -DUSE_BOOST_ASIO=ON
         ${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)
diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json
@@ -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": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6082,7 +6082,7 @@
     },
     "sleepy-discord": {
       "baseline": "2021-07-07",
-      "port-version": 0
+      "port-version": 1
     },
     "slikenet": {
       "baseline": "2021-06-07",

diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0aba637e01389ec4ed5923eaf898ca78dac96cbb",
+      "version-date": "2021-07-07",
+      "port-version": 1
+    },
     {
       "git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda",
       "version-date": "2021-07-07",