* Add https:// to the homepage so that it is a valid URI.

* Added usage. * Forced pkgconfig to be required rather than quiet. * Changed tabs to spaces in portfile.cmake.
microsoft · Jul 26, 2022 · 22ca917 · 22ca917
1 parent e74f160
commit 22ca917
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/ports/dpp/make-pkgconfig-required.patch b/ports/dpp/make-pkgconfig-required.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/FindSodium.cmake b/cmake/FindSodium.cmake
+index 23c5317..abbd08f 100644
+--- a/cmake/FindSodium.cmake
++++ b/cmake/FindSodium.cmake
+@@ -46,9 +46,9 @@ endif()
+ # UNIX
+ if(UNIX)
+   # import pkg-config
+-  find_package(PkgConfig QUIET)
++  find_package(PkgConfig REQUIRED)
+   if(PKG_CONFIG_FOUND)
+-    pkg_check_modules(sodium_PKG QUIET libsodium)
++    pkg_check_modules(sodium_PKG REQUIRED libsodium)
+   endif()
+
+   if(sodium_USE_STATIC_LIBS)
diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO brainboxdotcc/DPP
-	REF d9eb0083c7d4f3bb188ac4fde12f3af9a4443696
-	SHA512 5b6514a1152d566bba8959f2e51284142d57eec086e634a2b33a08186ee5cb5800a6244d92b9c8e367b60a542ed75b4401f4d68b510f16226633b958aa4aeefa
-	HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO brainboxdotcc/DPP
+    REF d9eb0083c7d4f3bb188ac4fde12f3af9a4443696
+    SHA512 5b6514a1152d566bba8959f2e51284142d57eec086e634a2b33a08186ee5cb5800a6244d92b9c8e367b60a542ed75b4401f4d68b510f16226633b958aa4aeefa
+    HEAD_REF master
+    PATCHES
+        make-pkgconfig-required.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,7 +24,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(
-	INSTALL "${SOURCE_PATH}/LICENSE"
-	DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-	RENAME copyright
+    INSTALL "${SOURCE_PATH}/LICENSE"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+    RENAME copyright
 )
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/dpp/usage b/ports/dpp/usage
@@ -0,0 +1,3 @@
+dpp provides CMake targets:
+    find_package(dpp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE dpp::dpp)
diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json
@@ -2,7 +2,7 @@
   "name": "dpp",
   "version": "10.0.15",
   "description": "D++ Extremely Lightweight C++ Discord Library.",
-  "homepage": "dpp.dev/",
+  "homepage": "https://dpp.dev/",
   "license": "Apache-2.0",
   "supports": "(windows & !static & !uwp) | linux | osx",
   "dependencies": [

diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "dcbf9e1fe5ed0da9ad205de49494218f53b42b0e",
+      "git-tree": "fe4fafd238e318a6ddf7d5c4db59da499328fdae",
       "version": "10.0.15",
       "port-version": 0
     }