From 7029557ee77182d2b086839fce6409fbb211fc5a Mon Sep 17 00:00:00 2001
From: kreuzerkrieg <kreuzerkrieg@gmail.com>
Date: Thu, 19 Mar 2020 07:53:31 +0200
Subject: Fix the naming mess (#10367)

---
 ports/cpuid/CONTROL           |  5 +++++
 ports/cpuid/portfile.cmake    | 27 +++++++++++++++++++++++++++
 ports/libcpuid/CONTROL        |  5 -----
 ports/libcpuid/portfile.cmake | 27 ---------------------------
 scripts/ci.baseline.txt       |  6 +++---
 5 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 ports/cpuid/CONTROL
 create mode 100644 ports/cpuid/portfile.cmake
 delete mode 100644 ports/libcpuid/CONTROL
 delete mode 100644 ports/libcpuid/portfile.cmake

diff --git a/ports/cpuid/CONTROL b/ports/cpuid/CONTROL
new file mode 100644
index 000000000..84209185f
--- /dev/null
+++ b/ports/cpuid/CONTROL
@@ -0,0 +1,5 @@
+Source: cpuid
+Version: 0.4.1
+Homepage: https://github.com/anrieff/libcpuid
+Description: Provides CPU identification for the x86 (and x86_64)
+Supports: x86 | x64
diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake
new file mode 100644
index 000000000..70f80d70f
--- /dev/null
+++ b/ports/cpuid/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO anrieff/libcpuid
+        REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0
+        SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d
+        HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        PREFER_NINJA
+        OPTIONS
+        -DENABLE_DOCS=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpuid)
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libcpuid/CONTROL b/ports/libcpuid/CONTROL
deleted file mode 100644
index a39e59e23..000000000
--- a/ports/libcpuid/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: libcpuid
-Version: 0.4.1
-Homepage: https://github.com/anrieff/libcpuid
-Description: Provides CPU identification for the x86 (and x86_64)
-Supports: x86 | x64
diff --git a/ports/libcpuid/portfile.cmake b/ports/libcpuid/portfile.cmake
deleted file mode 100644
index 16d073951..000000000
--- a/ports/libcpuid/portfile.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO anrieff/libcpuid
-        REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0
-        SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d
-        HEAD_REF master
-)
-
-vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        PREFER_NINJA
-        OPTIONS
-        -DENABLE_DOCS=OFF
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
-
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 9e5ec87f5..58d953af6 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -719,9 +719,9 @@ libconfig:x64-osx=fail
 libcopp:arm64-windows=fail
 libcopp:arm-uwp=fail
 libcopp:x64-windows-static=fail
-libcpuid:arm-uwp=fail
-libcpuid:x64-uwp=fail
-libcpuid:arm64-windows=fail
+cpuid:arm-uwp=fail
+cpuid:x64-uwp=fail
+cpuid:arm64-windows=fail
 libdatrie:x64-linux=fail
 libdatrie:x64-osx=fail
 libdisasm:arm-uwp=fail
-- 
cgit v1.2.3