mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 02:11:58 +08:00
[simd] Bump to 6.1.139 (#39908)
This commit is contained in:
parent
fc98ae65d9
commit
7ef9d0ddfe
1
ports/simd/SimdConfig.cmake
Normal file
1
ports/simd/SimdConfig.cmake
Normal file
@ -0,0 +1 @@
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/simdtargets.cmake")
|
13
ports/simd/fix-platform-detection.patch
Normal file
13
ports/simd/fix-platform-detection.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/prj/cmake/CMakeLists.txt b/prj/cmake/CMakeLists.txt
|
||||
index c08c3f99..7858d801 100644
|
||||
--- a/prj/cmake/CMakeLists.txt
|
||||
+++ b/prj/cmake/CMakeLists.txt
|
||||
@@ -160,7 +160,7 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio")
|
||||
else()
|
||||
if((CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"))
|
||||
include(x86.cmake)
|
||||
- elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "arm") OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"))
|
||||
+ elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "arm") OR (CMAKE_SYSTEM_PROCESSOR MATCHES "ARM") OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"))
|
||||
include(arm.cmake)
|
||||
else()
|
||||
message(FATAL_ERROR "Unknown value of CMAKE_SYSTEM_PROCESSOR!")
|
@ -2,8 +2,10 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ermig1979/Simd
|
||||
REF "v${VERSION}"
|
||||
SHA512 33521f493f59e7d0a82d4307cd0178e45cd47a2daa768430190789b601a8b214b7e4d9ca0c8116a6190c804854a3bca8c7e4048b6d8e1c288d8c58f27aa2b476
|
||||
SHA512 e2db7d24260ee725435ef6aa80a0e936f72bf8c8ce42a6a732d60b49349a3f6cc0603391a430c97f1aaa2368a07243fc2bed10189ebd965609494d59d41fb58c
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-platform-detection.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
|
||||
@ -51,36 +53,33 @@ if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPK
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PROJECT_SUBPATH "/prj/${SOLUTION_TYPE}/Simd.sln"
|
||||
PLATFORM ${SIMD_PLATFORM}
|
||||
TARGET Simd
|
||||
TARGET "lib\\Simd"
|
||||
RELEASE_CONFIGURATION "Release"
|
||||
DEBUG_CONFIGURATION "Debug"
|
||||
)
|
||||
vcpkg_copy_pdbs()
|
||||
file(GLOB SIMD_HEADERS "${SOURCE_PATH}/src/Simd/*.hpp" "${SOURCE_PATH}/src/Simd/*.h")
|
||||
file(COPY ${SIMD_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Simd")
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
message(FATAL_ERROR "Arm64 building with MSVC is currently not supported.")
|
||||
else()
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}/prj/cmake"
|
||||
OPTIONS
|
||||
-DSIMD_TARGET="aarch64"
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
endif()
|
||||
elseif((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND (VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"))
|
||||
message(FATAL_ERROR "Arm64 building with MSVC is currently not supported.")
|
||||
else()
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
vcpkg_replace_string("${SOURCE_PATH}/src/Simd/SimdConfig.h"
|
||||
"//#define SIMD_STATIC"
|
||||
"#define SIMD_STATIC"
|
||||
)
|
||||
endif()
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SIMD_SHARED)
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}/prj/cmake"
|
||||
OPTIONS
|
||||
-DSIMD_TEST=OFF
|
||||
-DSIMD_SHARED=${SIMD_SHARED}
|
||||
-DSIMD_PYTHON=OFF
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/SimdConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/simd/")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
endif()
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "simd",
|
||||
"version": "5.3.128",
|
||||
"port-version": 1,
|
||||
"version": "6.1.139",
|
||||
"description": "Simd image processing and machine learning library, designed for C and C++ programmers",
|
||||
"homepage": "https://github.com/ermig1979/Simd",
|
||||
"license": "MIT",
|
||||
|
@ -8193,8 +8193,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"simd": {
|
||||
"baseline": "5.3.128",
|
||||
"port-version": 1
|
||||
"baseline": "6.1.139",
|
||||
"port-version": 0
|
||||
},
|
||||
"simde": {
|
||||
"baseline": "0.8.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2d8b5c102d537d5736d6f969e20dbba1ffe5f801",
|
||||
"version": "6.1.139",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "ffd162c11ab46810863df261f1f373ad008af239",
|
||||
"version": "5.3.128",
|
||||
|
Loading…
x
Reference in New Issue
Block a user