AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-10 03:30:39 +03:00
Code Releases Activity

Merge pull request #1079 from metalefty/skip_cpu_features

Browse Source 
allow to SKIP_CPU_FEATURES explicitly, not only autodetect
This commit is contained in:
Ilya Shipitsin 2020-03-18 11:59:02 +05:00 committed by GitHub
commit c3d56c2201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cirrus.yml
View File

@ -2,13 +2,12 @@ FreeBSD_task:
matrix: matrix:
env: env:
SSL: openssl SSL: openssl
env:
SSL: openssl111
env: env:
SSL: libressl SSL: libressl
env: env:
SSL: libressl-devel SSL: libressl-devel
env: env:
# base openssl
SSL: SSL:
matrix: matrix:
freebsd_instance: freebsd_instance:

2
src/Mayaqua/CMakeLists.txt
View File

@ -65,7 +65,7 @@ if(UNIX)
target_link_libraries(mayaqua PRIVATE OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB) target_link_libraries(mayaqua PRIVATE OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB)
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7l|aarch64|s390x)$" OR NOT HAVE_SYS_AUXV) if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7l|aarch64|s390x)$" OR NOT HAVE_SYS_AUXV OR SKIP_CPU_FEATURES)
add_definitions(-DSKIP_CPU_FEATURES) add_definitions(-DSKIP_CPU_FEATURES)
else() else()
add_subdirectory(3rdparty/cpu_features) add_subdirectory(3rdparty/cpu_features)