mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-11-10 03:30:39 +03:00
Merge pull request #1079 from metalefty/skip_cpu_features
allow to SKIP_CPU_FEATURES explicitly, not only autodetect
This commit is contained in:
commit
c3d56c2201
@ -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:
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user