Skip to content

Commit

Permalink
[networkdirect-sdk] Rework portfile.cmake to allow windows x64 and x8…
Browse files Browse the repository at this point in the history
…6, 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
  • Loading branch information
StarGate-One committed Nov 30, 2020
1 parent 51f295a commit 65d742a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
3 changes: 2 additions & 1 deletion ports/networkdirect-sdk/CONTROL
Original file line number Diff line number Diff line change
@@ -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
10 changes: 2 additions & 8 deletions ports/networkdirect-sdk/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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)
6 changes: 0 additions & 6 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 65d742a

Please sign in to comment.