aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <47264268+JackBoosY@users.noreply.github.com>2019-06-25 02:38:10 +0800
committerPhil Christensen <philc@microsoft.com>2019-06-24 11:38:10 -0700
commit4f675eafb64afc103f7cb1dc14cbfe07a65559ec (patch)
treef9bc75929ccc24c7833f3e4d6cb1be74f8761897
parent25f628e05f8f6a838b68ad25cc52a4ee221bd8ec (diff)
downloadvcpkg-4f675eafb64afc103f7cb1dc14cbfe07a65559ec.tar.gz
vcpkg-4f675eafb64afc103f7cb1dc14cbfe07a65559ec.zip
[libtins]Upgrade version to 4.2 and adds dependent ports to new version. (#7008)
-rw-r--r--ports/libtins/CONTROL4
-rw-r--r--ports/libtins/portfile.cmake12
2 files changed, 10 insertions, 6 deletions
diff --git a/ports/libtins/CONTROL b/ports/libtins/CONTROL
index 4bd5d3755..11cb86ea8 100644
--- a/ports/libtins/CONTROL
+++ b/ports/libtins/CONTROL
@@ -1,4 +1,4 @@
Source: libtins
-Version: 4.0-3
+Version: 4.2
Description: High-level, multiplatform C++ network packet sniffing and crafting library
-Build-Depends: winpcap (windows)
+Build-Depends: winpcap (windows), boost-icl, boost-any
diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake
index 1839d118c..dabd283d0 100644
--- a/ports/libtins/portfile.cmake
+++ b/ports/libtins/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mfontanini/libtins
- REF v4.0
- SHA512 8a497617ca68f4bad331452778b92c51ce87e42d1ceae493ecd6799cabbe71609214ca962c4a8c83d205f76277f2a82f92d3d17341984caa1592cf237eb3cf3b
+ REF v4.2
+ SHA512 46d07712604c780e418135c996f195046fd85a9e1411962c9bcee3c8d0fc64f494aa50164236ffd1e77ff8a398e9617bbf040b3e01a5771c5621c0faa1ce312f
HEAD_REF master
)
@@ -25,12 +25,16 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") #Windows
+ vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+else() #Linux/Unix/Darwin
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libtins)
+endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtins/copyright COPYONLY)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtins RENAME copyright)
# Post-build test for cmake libraries
vcpkg_test_cmake(PACKAGE_NAME libtins)