From 63f9a4aeff92113a33aacee033d34670199f10f6 Mon Sep 17 00:00:00 2001
From: Jacob Kahn <jacobkahn1@gmail.com>
Date: Thu, 31 Dec 2020 00:38:55 -0600
Subject: [onednn] Fix share path infix to match find_package() name (#15372)

* [onednn] Fix share path infix to match find_package() name

* Add port-version

* Install failure message
---
 ports/onednn/portfile.cmake | 6 +++++-
 ports/onednn/vcpkg.json     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake
index 4a9600ac7..c2179d5ff 100644
--- a/ports/onednn/portfile.cmake
+++ b/ports/onednn/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oneapi-src/oneDNN
@@ -17,7 +19,9 @@ vcpkg_configure_cmake(
 )
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+# The port name and the find_package() name are different (onednn versus dnnl)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dnnl TARGET_PATH share/dnnl)
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json
index 7ceebd191..86f7989f4 100644
--- a/ports/onednn/vcpkg.json
+++ b/ports/onednn/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "onednn",
   "version-string": "2.0",
+  "port-version": 1,
   "description": "oneAPI Deep Neural Network Library (oneDNN)",
   "supports": "x64 & !uwp"
 }
-- 
cgit v1.2.3