mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 10:29:00 +08:00
d00223cbb9
* allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows-static --recurse * allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows --recurse * fix static build of ffmpeg-executables build ffplay.exe etc. failed because we tried to link ".a"-libraries * allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows-static --recurse * allow building "ffmpeg.exe" add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows --recurse * fix static build of ffmpeg-executables build ffplay.exe etc. failed because we tried to link ".a"-libraries * Remove duplicate feature entries * [clapack] Fix linux build * [openblas] Remove restriction of build static lib on Linux * Update ports/openblas/portfile.cmake Co-Authored-By: kafeg <v31337@gmail.com> * [ffmpeg] bump control version number * [ffmpeg] switch to vcpkg_extract_source_archive_ex * add parallel-hashmap package * update version of package * Check scripts/cmake/* and buildsystems/vcpkg.cmake for changes when hashing * [cryptopp] Update the version to 8.1.0(Fix #3260) * [darknet] add compatibility with OpenCV 4 (#6018) * [curl] Bump CONTROL version (#6012) * [sdl1]Fix sdl1 conflict with sdl2 (#6011) * Use Opus CMake #4875 (#6007) * Print what port installed confliciting files * Revert "Print what port installed confliciting files" This reverts commit79682317c9. * Complete revert of accidental mergeb1b7ec5c0b* [activemq-cpp] Add activemq-cpp library (#6017) * [fix][ffmpeg] changing $PATH separator for Linux (#6015) * [fix][ffmpeg] changing $PATH separator for Linux Using a semicolon in $PATH might break on some flavors of Linux, eg Docker based on Ubuntu 18.04. * Enable openssl:arm64-windows * Add missing dependency for static Qt builds * Enable pcre:arm64-windows Update sljitConfigInternal.h for ARM64, resolve error C2375: 'FlushInstructionCache': redefinition; different linkage * Enable pcre:arm64-windows Update format * Enable pcre2:arm64-windows Update sljitConfigInternal.h for ARM64 * partial update for testing * add git hash * Revert "add git hash" This reverts commit1a3b388a91. * Revert "partial update for testing" This reverts commit880181892e. * [openssl-windows] Bump version number * [pcre2] Bump version number * [openvdb] Fix openvdb[tools] build failures (#6028) * Update CONTROL Bump the version in CONTROL file * Update CONTROL Bump the version in CONTROL file * Update CONTROL Revert version number since @grdowns already bumps version number * Add --no-recurse switch to depend-info command. * Add -allowAppleClang option to bootstrap.sh. (fixes #4698) (#5915) * Add -allowAppleClang option to bootstrap.sh. (fixes #4698) * [vcpkg-bootstrap] Simplify appleclang changes and reformat * [vcpkg-bootstrap] Remove enviroment variable VCPKG_ALLOW_APPLE_CLANG * [distorm, scylla_wrapper, devicenameresolver] init (#4170) * distorm init * scylla wrapper init * devicenameresolver init * [devicenameresolver][distorm][scylla-wrapper] Cleanup and mark libraries as dll-only. * Bumb version number for qt5-base port * [devil/libcopp/spaceland] stable cmake config (#6046) * [darknet] sync with community expected version, add fixes for downstream projects (#6047) * Print what port installed confliciting files (#6037) * [PEGTL] Upgrade to 2.8.0 Migration guide: https://github.com/taocpp/PEGTL/blob/master/doc/Migration-Guide.md#version-280 * [docs] Add VCPKG_CMAKE_SYSTEM_VERSION (#6061) * Add help entry for depend-info * [jsoncons] add port * Bump version numbers, fix system name check * [libpqxx]Update to version 6.4.3 * Add missing compiler flags
21 lines
1.4 KiB
Diff
21 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b49fff6..f753e75 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -639,6 +639,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
|
|
set_source_files_properties(${SRC_DIR}/simeck_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
|
|
set_source_files_properties(${SRC_DIR}/simon128_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
|
|
set_source_files_properties(${SRC_DIR}/speck128_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
|
|
+ set_source_files_properties(${SRC_DIR}/keccak_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3")
|
|
if (CRYPTOPP_IA32_SSE41 AND NOT DISABLE_SSE4)
|
|
set_source_files_properties(${SRC_DIR}/blake2s_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
|
|
set_source_files_properties(${SRC_DIR}/blake2b_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1")
|
|
@@ -648,6 +649,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
|
|
if (CRYPTOPP_IA32_SSE42 AND NOT DISABLE_SSE4)
|
|
set_source_files_properties(${SRC_DIR}/crc_simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.2")
|
|
if (CRYPTOPP_IA32_CLMUL AND NOT DISABLE_AES)
|
|
+ set_source_files_properties(${SRC_DIR}/gf2n_simd.cpp PROPERTIES COMPILE_FLAGS "-mpclmul")
|
|
set_source_files_properties(${SRC_DIR}/gcm_simd.cpp PROPERTIES COMPILE_FLAGS "-mssse3 -mpclmul")
|
|
endif ()
|
|
if (CRYPTOPP_IA32_AES AND NOT DISABLE_AES)
|