mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:59:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[simd] Update include missing header files (#28834)

Browse Source 
* Update include missing header files

* Update simd.json

* Update fix-CMakeLists-install.patch

* Update vcpkg.json

* Update fix-CMakeLists-install.patch

* Update simd.json

* Update simd.json
This commit is contained in:
Edi61 2023-01-12 08:26:28 +01:00 committed by GitHub
parent 5b76887a11
commit b591b65d2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/simd/fix-CMakeLists-install.patch
View File

@ -1,28 +1,30 @@
diff --git "a/prj/cmake/arm.cmake" "b/prj/cmake/arm.cmake"
index 791acf2..858b636 100644
index 7589930..b92b9d0 100644
--- "a/prj/cmake/arm.cmake"
+++ "b/prj/cmake/arm.cmake"
@@ -27,6 +27,10 @@ file(GLOB_RECURSE SIMD_LIB_SRC ${SIMD_ROOT}/src/Simd/SimdLib.cpp)
@@ -27,6 +27,11 @@ file(GLOB_RECURSE SIMD_LIB_SRC ${SIMD_ROOT}/src/Simd/SimdLib.cpp)
set_source_files_properties(${SIMD_LIB_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${CXX_NEON_FLAG}")
add_library(Simd ${SIMD_LIB_TYPE} ${SIMD_LIB_SRC} ${SIMD_BASE_SRC} ${SIMD_NEON_SRC})
+set_target_properties(Simd PROPERTIES PUBLIC_HEADER "${SIMD_ROOT}/src/Simd/SimdLib.h;${SIMD_ROOT}/src/Simd/SimdLib.hpp")
+install(TARGETS Simd EXPORT simdtargets LIBRARY DESTINATION "lib" PUBLIC_HEADER DESTINATION "include")
+file(GLOB SIMD_HEADERS "${SIMD_ROOT}/src/Simd/*.hpp" "${SIMD_ROOT}/src/Simd/*.h")
+set_target_properties(Simd PROPERTIES PUBLIC_HEADER "${SIMD_HEADERS}")
+install(TARGETS Simd EXPORT simdtargets LIBRARY DESTINATION "lib" PUBLIC_HEADER DESTINATION "include/Simd")
+install(EXPORT simdtargets DESTINATION share/simd)
+
if(SIMD_TEST)
file(GLOB_RECURSE TEST_SRC_C ${SIMD_ROOT}/src/Test/*.c)
file(GLOB_RECURSE TEST_SRC_CPP ${SIMD_ROOT}/src/Test/*.cpp)
diff --git "a/prj/cmake/x86.cmake" "b/prj/cmake/x86.cmake"
index c6799a6..7e80255 100644
index 944bd5c..9b5180f 100644
--- "a/prj/cmake/x86.cmake"
+++ "b/prj/cmake/x86.cmake"
@@ -83,6 +83,10 @@ file(GLOB_RECURSE SIMD_LIB_SRC ${SIMD_ROOT}/src/Simd/SimdLib.cpp)
@@ -83,6 +83,11 @@ file(GLOB_RECURSE SIMD_LIB_SRC ${SIMD_ROOT}/src/Simd/SimdLib.cpp)
set_source_files_properties(${SIMD_LIB_SRC} PROPERTIES COMPILE_FLAGS "${SIMD_LIB_FLAGS}")
add_library(Simd ${SIMD_LIB_TYPE} ${SIMD_LIB_SRC} ${SIMD_ALG_SRC})
+set_target_properties(Simd PROPERTIES PUBLIC_HEADER "${SIMD_ROOT}/src/Simd/SimdLib.h;${SIMD_ROOT}/src/Simd/SimdLib.hpp")
+install(TARGETS Simd EXPORT simdtargets LIBRARY DESTINATION "lib" PUBLIC_HEADER DESTINATION "include")
+file(GLOB SIMD_HEADERS "${SIMD_ROOT}/src/Simd/*.hpp" "${SIMD_ROOT}/src/Simd/*.h")
+set_target_properties(Simd PROPERTIES PUBLIC_HEADER "${SIMD_HEADERS}")
+install(TARGETS Simd EXPORT simdtargets LIBRARY DESTINATION "lib" PUBLIC_HEADER DESTINATION "include/Simd")
+install(EXPORT simdtargets DESTINATION share/simd)
+
if(SIMD_TEST)

5
ports/simd/portfile.cmake
View File

@ -51,9 +51,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPK
DEBUG_CONFIGURATION "Debug"
)
file(GLOB HEADERS "${SOURCE_PATH}/src/Simd/*.hpp")
file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
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.")

2
ports/simd/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "simd",
"version": "5.1.119",
"port-version": 1,
"port-version": 2,
"description": "Simd image processing and machine learning library, designed for C and C++ programmers",
"homepage": "https://github.com/ermig1979/Simd",
"license": "MIT",

2
versions/baseline.json
View File

@ -7062,7 +7062,7 @@
},
"simd": {
"baseline": "5.1.119",
"port-version": 1
"port-version": 2
},
"simde": {
"baseline": "0.7.2",

5
versions/s-/simd.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ac8b6441609b8504f6e26937d2c1a3e08a20d451",
"version": "5.1.119",
"port-version": 2
},
{
"git-tree": "7c8374b279a8fd0ba3c0c30886ccbfb4bcc4152f",
"version": "5.1.119",