mirror of https://github.com/microsoft/vcpkg.git
parent
628c0143b8
commit
e5ce4b6244
|
|
@ -11,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE
|
|||
)
|
||||
|
||||
# MSBuild performs in-source builds, so to ensure reliability we must clear them each time
|
||||
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
|
||||
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src")
|
||||
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL "static")
|
||||
set(CRT_LINKAGE "MT")
|
||||
|
|
@ -30,7 +30,7 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/wpcap.patch.in" "${CURRENT_BUILDTREES_
|
|||
|
||||
vcpkg_extract_source_archive(
|
||||
SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
SOURCE_BASE ${WINPCAP_VERSION}
|
||||
PATCHES
|
||||
"${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch"
|
||||
|
|
@ -59,8 +59,9 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "
|
|||
configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY)
|
||||
endif()
|
||||
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.sln"
|
||||
vcpkg_msbuild_install(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
PROJECT_SUBPATH "packetNtx/Dll/Project/Packet.sln"
|
||||
RELEASE_CONFIGURATION "Release"
|
||||
DEBUG_CONFIGURATION "Debug"
|
||||
PLATFORM ${PLATFORM}
|
||||
|
|
@ -70,8 +71,8 @@ vcpkg_find_acquire_program(BISON)
|
|||
vcpkg_find_acquire_program(FLEX)
|
||||
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
COMMAND "${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat"
|
||||
WORKING_DIRECTORY "${SOURCE_PATH}"
|
||||
LOGNAME build_scanner_parser-${TARGET_TRIPLET}
|
||||
)
|
||||
|
||||
|
|
@ -79,7 +80,7 @@ vcpkg_execute_required_process(
|
|||
COMMAND "devenv.exe"
|
||||
"wpcap.sln"
|
||||
/Upgrade
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}/wpcap/PRJ
|
||||
WORKING_DIRECTORY "${SOURCE_PATH}/wpcap/PRJ"
|
||||
LOGNAME upgrade-wpcap-${TARGET_TRIPLET}
|
||||
)
|
||||
|
||||
|
|
@ -87,16 +88,17 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "
|
|||
configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY)
|
||||
endif()
|
||||
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH "${SOURCE_PATH}/wpcap/PRJ/wpcap.sln"
|
||||
vcpkg_msbuild_install(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
PROJECT_SUBPATH "wpcap/PRJ/wpcap.sln"
|
||||
RELEASE_CONFIGURATION "Release - No AirPcap"
|
||||
DEBUG_CONFIGURATION "Debug - No AirPcap"
|
||||
PLATFORM ${PLATFORM}
|
||||
)
|
||||
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${SOURCE_PATH}/create_include.bat
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
COMMAND "${SOURCE_PATH}/create_include.bat"
|
||||
WORKING_DIRECTORY "${SOURCE_PATH}"
|
||||
LOGNAME create_include-${TARGET_TRIPLET}
|
||||
)
|
||||
|
||||
|
|
@ -123,8 +125,8 @@ file(INSTALL
|
|||
DESTINATION "${CURRENT_PACKAGES_DIR}/include/pcap")
|
||||
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${SOURCE_PATH}/create_lib.bat
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
COMMAND "${SOURCE_PATH}/create_lib.bat"
|
||||
WORKING_DIRECTORY "${SOURCE_PATH}"
|
||||
LOGNAME create_lib-${TARGET_TRIPLET}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,15 @@
|
|||
{
|
||||
"name": "winpcap",
|
||||
"version": "4.1.3",
|
||||
"port-version": 10,
|
||||
"port-version": 11,
|
||||
"description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.",
|
||||
"homepage": "https://www.winpcap.org",
|
||||
"supports": "windows"
|
||||
"supports": "windows",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-msbuild",
|
||||
"host": true,
|
||||
"platform": "windows"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8730,7 +8730,7 @@
|
|||
},
|
||||
"winpcap": {
|
||||
"baseline": "4.1.3",
|
||||
"port-version": 10
|
||||
"port-version": 11
|
||||
},
|
||||
"winpty": {
|
||||
"baseline": "0.4.3",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "fa00dc5de34d5076f7d7bad06b649b6ce4412b68",
|
||||
"version": "4.1.3",
|
||||
"port-version": 11
|
||||
},
|
||||
{
|
||||
"git-tree": "93484c8257a6ac5a90f5d540d143a6f4fe5968f2",
|
||||
"version": "4.1.3",
|
||||
|
|
|
|||
Loading…
Reference in New Issue