mirror of https://github.com/microsoft/vcpkg.git
[simd] Avoid build race. (#53108)
This commit is contained in:
parent
e4300a9a73
commit
827a2e1203
|
|
@ -6,6 +6,14 @@ vcpkg_from_github(
|
|||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-platform-detection.patch
|
||||
use-preconfigured-version-header.patch
|
||||
)
|
||||
|
||||
# Avoid upstream's debug and release configure steps racing to generate this shared source-tree file.
|
||||
configure_file(
|
||||
"${SOURCE_PATH}/prj/txt/SimdVersion.h.txt"
|
||||
"${SOURCE_PATH}/src/Simd/SimdVersion.h"
|
||||
@ONLY
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/prj/cmake/CMakeLists.txt b/prj/cmake/CMakeLists.txt
|
||||
index ebe2847..15922a8 100644
|
||||
--- a/prj/cmake/CMakeLists.txt
|
||||
+++ b/prj/cmake/CMakeLists.txt
|
||||
@@ -114,12 +114,6 @@ endif()
|
||||
include_directories("${SIMD_ROOT}/src")
|
||||
|
||||
if(SIMD_GET_VERSION)
|
||||
- if (WIN32 AND NOT (CYGWIN OR MSYS))
|
||||
- string(REPLACE "/" "\\" SIMD_ROOT_WINDOWS ${SIMD_ROOT})
|
||||
- execute_process(COMMAND "${SIMD_ROOT}/prj/cmd/GetVersion.cmd" "${SIMD_ROOT_WINDOWS}" "${SIMD_INFO}")
|
||||
- else()
|
||||
- execute_process(COMMAND bash "${SIMD_ROOT}/prj/sh/GetVersion.sh" "${SIMD_ROOT}" "${SIMD_INFO}")
|
||||
- endif()
|
||||
else()
|
||||
add_definitions(-DSIMD_VERSION="unknown")
|
||||
endif()
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "simd",
|
||||
"version": "7.1.162",
|
||||
"port-version": 1,
|
||||
"description": "Simd image processing and machine learning library, designed for C and C++ programmers",
|
||||
"homepage": "https://github.com/ermig1979/Simd",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -9362,7 +9362,7 @@
|
|||
},
|
||||
"simd": {
|
||||
"baseline": "7.1.162",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"simde": {
|
||||
"baseline": "0.8.2",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3a13bc1bf73c5267ce83b5e662dc54f0e25c99dd",
|
||||
"version": "7.1.162",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "4334e58736a5d5482d2dd73f71afbf3c0f6cdecb",
|
||||
"version": "7.1.162",
|
||||
|
|
|
|||
Loading…
Reference in New Issue