From 7029557ee77182d2b086839fce6409fbb211fc5a Mon Sep 17 00:00:00 2001 From: kreuzerkrieg Date: Thu, 19 Mar 2020 07:53:31 +0200 Subject: [PATCH] Fix the naming mess (#10367) --- ports/{libcpuid => cpuid}/CONTROL | 2 +- ports/{libcpuid => cpuid}/portfile.cmake | 2 +- scripts/ci.baseline.txt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename ports/{libcpuid => cpuid}/CONTROL (89%) rename ports/{libcpuid => cpuid}/portfile.cmake (93%) diff --git a/ports/libcpuid/CONTROL b/ports/cpuid/CONTROL similarity index 89% rename from ports/libcpuid/CONTROL rename to ports/cpuid/CONTROL index a39e59e23..84209185f 100644 --- a/ports/libcpuid/CONTROL +++ b/ports/cpuid/CONTROL @@ -1,4 +1,4 @@ -Source: libcpuid +Source: cpuid Version: 0.4.1 Homepage: https://github.com/anrieff/libcpuid Description: Provides CPU identification for the x86 (and x86_64) diff --git a/ports/libcpuid/portfile.cmake b/ports/cpuid/portfile.cmake similarity index 93% rename from ports/libcpuid/portfile.cmake rename to ports/cpuid/portfile.cmake index 16d073951..70f80d70f 100644 --- a/ports/libcpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -18,7 +18,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpuid) vcpkg_copy_pdbs() 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