early-access version 2853

externals/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch

@@ -0,0 +1,70 @@
+From 68ece3bba0d79ab721a0c50ee1e6014a37f759dc Mon Sep 17 00:00:00 2001
+From: Wei Dai <wei.dai@microsoft.com>
+Date: Mon, 24 May 2021 10:02:07 -0700
+Subject: [PATCH] Added an option to disable the executable target
+ list_cpu_feature.
+
+---
+ CMakeLists.txt | 23 ++++++++++++++++++-----
+ 1 file changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f9daeac..48eea0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,6 +17,8 @@ if(NOT CMAKE_BUILD_TYPE)
+       FORCE)
+ endif(NOT CMAKE_BUILD_TYPE)
+ 
++# An option to disable the executable target list_cpu_features.
++option(BUILD_EXECUTABLE "Build list_cpu_features executable." ON)
+ # BUILD_TESTING is a standard CMake variable, but we declare it here to make it
+ # prominent in the GUI.
+ option(BUILD_TESTING "Enable test (depends on googletest)." OFF)
+@@ -157,9 +159,11 @@ add_library(CpuFeature::cpu_features ALIAS cpu_features)
+ # program : list_cpu_features
+ #
+ 
+-add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c)
+-target_link_libraries(list_cpu_features PRIVATE cpu_features)
+-add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features)
++if(BUILD_EXECUTABLE)
++  add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c)
++  target_link_libraries(list_cpu_features PRIVATE cpu_features)
++  add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features)
++endif()
+ 
+ #
+ # ndk_compat
+@@ -223,17 +227,26 @@ if(BUILD_TESTING)
+ endif()
+ 
+ #
+-# Install cpu_features and list_cpu_features
++# Install cpu_features and optionally list_cpu_features
+ #
+ 
+ include(GNUInstallDirs)
+-install(TARGETS cpu_features list_cpu_features
++install(TARGETS cpu_features
+   EXPORT CpuFeaturesTargets
+   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
++if(BUILD_EXECUTABLE)
++  install(TARGETS list_cpu_features
++    EXPORT CpuFeaturesTargets
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  )
++endif()
+ install(EXPORT CpuFeaturesTargets
+   NAMESPACE CpuFeatures::
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CpuFeatures
+-- 
+2.25.1
+

externals/vcpkg/ports/cpu-features/portfile.cmake

@@ -0,0 +1,37 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/cpu_features
+    REF a8397ba4591237c17d18e4acc091f5f3ebe7391e # 0.6.0
+    SHA512 71a583e8190699d6df3dfa2857886089265cdfbcb916d9828a3611a1d6d23487464d6448b900b49637f015dd7d4e18bb206e0249af0932928f8ced13a081d42b
+    HEAD_REF master
+    PATCHES
+        make_list_cpu_features_optional.patch
+        windows-x86-fix.patch
+)
+
+# If feature "tools" is not specified, disable building/exporting executable targets.
+# This is necessary so that downstream find_package(CpuFeatures) does not fail.
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools BUILD_EXECUTABLE
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures")
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES "list_cpu_features" AUTO_CLEAN)
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

externals/vcpkg/ports/cpu-features/vcpkg.json

@@ -0,0 +1,24 @@
+{
+  "name": "cpu-features",
+  "version": "0.6.0",
+  "port-version": 2,
+  "description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime",
+  "homepage": "https://github.com/google/cpu_features",
+  "license": "Apache-2.0",
+  "supports": "!(arm | uwp)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "list_cpu_features command line tool"
+    }
+  }
+}

externals/vcpkg/ports/cpu-features/windows-x86-fix.patch

@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,13 +60,13 @@
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+   set(PROCESSOR_IS_MIPS TRUE)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+   set(PROCESSOR_IS_ARM TRUE)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+   set(PROCESSOR_IS_AARCH64 TRUE)
+-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(AMD64|amd64)|(^i.86$)")
+   set(PROCESSOR_IS_X86 TRUE)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+   set(PROCESSOR_IS_POWER TRUE)
+ endif()
+ 
+ macro(add_cpu_features_headers_and_sources HDRS_LIST_NAME SRCS_LIST_NAME)