aboutsummaryrefslogtreecommitdiff
path: root/ports/libepoxy
diff options
context:
space:
mode:
authorNancyLi1013 <lirui09@beyondsoft.com>2020-04-06 19:21:59 -0700
committerNancyLi1013 <lirui09@beyondsoft.com>2020-04-06 19:22:19 -0700
commit9cbb1bd46e0948374fe496195cca828e68a71f3c (patch)
treee65160aa6a3783966bba32283d1dd2a2eb05a41f /ports/libepoxy
parent0f1294c61e51bba3c4257502852eecbe1a943a4b (diff)
parent6c4e822611324de4af9c8bb0ef8094e4a9b30a6e (diff)
downloadvcpkg-9cbb1bd46e0948374fe496195cca828e68a71f3c.tar.gz
vcpkg-9cbb1bd46e0948374fe496195cca828e68a71f3c.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/NancyLi/10611-fix-mosquitto
# Conflicts: # ports/libwebsockets/CONTROL
Diffstat (limited to 'ports/libepoxy')
-rw-r--r--ports/libepoxy/CONTROL2
-rw-r--r--ports/libepoxy/portfile.cmake6
2 files changed, 3 insertions, 5 deletions
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL
index f19def943..2ff219a8f 100644
--- a/ports/libepoxy/CONTROL
+++ b/ports/libepoxy/CONTROL
@@ -1,5 +1,5 @@
Source: libepoxy
-Version: 1.5.3-2
+Version: 1.5.3-3
Homepage: https://github.com/anholt/libepoxy
Description: Epoxy is a library for handling OpenGL function pointer management for you
Build-Depends: tool-meson
diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake
index 50f3fa55f..e578dd659 100644
--- a/ports/libepoxy/portfile.cmake
+++ b/ports/libepoxy/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
@@ -72,5 +70,5 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig)
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libepoxy)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libepoxy/COPYING ${CURRENT_PACKAGES_DIR}/share/libepoxy/copyright)
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)