mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 02:59:01 +08:00
e05c925db6
* Added new port for Simd Created new port for Simd from https://github.com/ermig1979/Simd * Added new port for Simd Created/updated new port for Simd from https://github.com/ermig1979/Simd * Revert "Merge branch 'master' of https://github.com/erdogan61/vcpkg" This reverts commit789c93e81a, reversing changes made toc87a8183bd. * portfile.cmake fixes Update x64-windows-static* and fixes * Update simd.json * Added missing define Set "#define in SIMD_STATIC/src/Simd/SimdConfig.h" * Update simd.json * Update simd.json * Revert "Revert "Merge branch 'master' of https://github.com/erdogan61/vcpkg"" This reverts commita97bdb05f4. * Added Linux support * Update simd.json * Added Cmake install patch Otherwise build error: "ninja: error: unknown target 'install'" * Update simd.json * Added supports in vcpkg.json * Update simd.json * Removed unsupported builds * x64_uwp failes UWP builds are failing, since not supported, Reason: The following DLLs do not have the App Container bit set: D:/packages/simd_x64-uwp/debug/bin/Simd.dll D:/packages/simd_x64-uwp/bin/Simd.dll * Update vcpkg.json * Update simd.json * Try ARM support, OSX not running Osx build failed, arm maybe supported * Update simd.json * Fix syntax error and optimize * Update simd.json * Fix syntax * Update simd.json * Added SIMD_TARGET="aarch64" * Update simd.json * Seperated arm64 cmake Check failes: #if defined(_MSC_VER) && !defined(__clang__) && (defined(SIMD_X64_ENABLE) || defined(SIMD_X86_ENABLE)) #define SIMD_INIT_AS_CHAR #elif defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && defined(SIMD_NEON_ENABLE)) #define SIMD_INIT_AS_LONGLONG #else #error This platform is unsupported! #endif * Update simd.json * Syntax Error * Update simd.json * Update to latest release 5.2.120 *fix bug: MSVS compiler bug (Windows, Arm64). commit b39197e00a902cbbc5ad397de92f086be994549b * Baseline Updates * Include arm64 fix * Update SHA512 * Update simd.json * Arm64 with msvc compiler not supported * Update simd.json * Updated supports field * Baseline update * Update ci.baseline.txt * Github action fix Replaced vcpkg_configure_cmake by vcpkg_cmake_configure * Update simd.json Co-authored-by: dtmen <dtmen@gmx.de>
31 lines
1.7 KiB
Diff
31 lines
1.7 KiB
Diff
diff --git "a/prj/cmake/arm.cmake" "b/prj/cmake/arm.cmake"
|
|
index 791acf2..858b636 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)
|
|
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")
|
|
+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
|
|
--- "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)
|
|
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")
|
|
+install(EXPORT simdtargets DESTINATION share/simd)
|
|
+
|
|
if(SIMD_TEST)
|
|
file(GLOB_RECURSE TEST_SRC_C ${SIMD_ROOT}/src/Test/*.c)
|
|
if((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
|