[networkdirect-sdk] Rework portfile.cmake to allow windows x64 and x86, add fail for other triplet combinations, remove all triplets for CI fail list (#14688)

* Fix x86 triplets conditional expression

* Update CI baseline - remove triplet x86-windows

* Change message to fail on arm, linux and osx message

* Add UWP to fail message and remove networkdirect-sdk from CI

* Fix vcpkg_fail_port_install function

* Remove windows x64 and x86 check

* Fix misspelled ON_TARGET and change Supports in CONTROL
This commit is contained in:
General Jack O'Neill 2020-11-30 18:58:22 -05:00 committed by GitHub
parent 51f295ade7
commit 65d742a57d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 15 deletions

View File

@ -1,5 +1,6 @@
Source: networkdirect-sdk
Version: 2.0.1
Port-Version: 1
Description: The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.
Homepage: https://www.nuget.org/packages/NetworkDirect
Supports: windows&(x64|x86)
Supports: windows & (x64|x86) & !uwp

View File

@ -1,11 +1,5 @@
#only supports windows
if (VCPKG_CMAKE_SYSTEM_NAME)
message(FATAL_ERROR "networkDirect-sdk only supports windows")
endif()
if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
message(FATAL_ERROR "networkDirect-sdk only supports x64 and x86")
endif()
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "linux" "osx")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@ -37,4 +31,4 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
file(COPY ${SOURCE_PATH}/lib/Win32/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
endif()
file(COPY ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/networkdirect-sdk/COPYRIGHT)
file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

View File

@ -981,12 +981,6 @@ nethost:x64-uwp=fail
nethost:arm-uwp=fail
nettle:x64-windows-static=skip
nettle:x64-windows=skip
networkdirect-sdk:arm64-windows=fail
networkdirect-sdk:arm-uwp=fail
networkdirect-sdk:x64-linux=fail
networkdirect-sdk:x64-osx=fail
networkdirect-sdk:x64-uwp=fail
networkdirect-sdk:x86-windows=fail
ngspice:x64-windows-static=fail
nng:arm-uwp=fail
nng:x64-uwp=fail