1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-06 01:30:40 +03:00

Add liboqs because it isn't normally packaged

This commit is contained in:
Siddharth 2024-06-21 15:14:49 -04:00
parent 102485a4b8
commit 13e6369db3
3 changed files with 14 additions and 0 deletions

3
.gitmodules vendored
View File

@ -13,3 +13,6 @@
[submodule "src/Mayaqua/3rdparty/oqs-provider"] [submodule "src/Mayaqua/3rdparty/oqs-provider"]
path = src/Mayaqua/3rdparty/oqs-provider path = src/Mayaqua/3rdparty/oqs-provider
url = https://github.com/open-quantum-safe/oqs-provider.git url = https://github.com/open-quantum-safe/oqs-provider.git
[submodule "src/Mayaqua/3rdparty/liboqs"]
path = src/Mayaqua/3rdparty/liboqs
url = https://github.com/open-quantum-safe/liboqs.git

1
src/Mayaqua/3rdparty/liboqs vendored Submodule

@ -0,0 +1 @@
Subproject commit e3f05cbfba4552067e2c0de524c1049a864c5f2d

View File

@ -74,6 +74,15 @@ if(WIN32)
"ws2_32.lib" "ws2_32.lib"
"WtsApi32.Lib" "WtsApi32.Lib"
) )
if (SKIP_OQS_PROVIDER)
add_definitions(-DSKIP_OQS_PROVIDER)
else()
add_subdirectory(3rdparty/liboqs)
set(OQS_PROVIDER_BUILD_STATIC ON CACHE BOOL "Build a static library instead of a shared library") # Build oqsprovider as a static library (defaults to shared)
add_subdirectory(3rdparty/oqs-provider)
set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(mayaqua PRIVATE oqsprovider)
endif()
endif() endif()
if(UNIX) if(UNIX)
@ -96,6 +105,7 @@ if(UNIX)
if (SKIP_OQS_PROVIDER) if (SKIP_OQS_PROVIDER)
add_definitions(-DSKIP_OQS_PROVIDER) add_definitions(-DSKIP_OQS_PROVIDER)
else() else()
add_subdirectory(3rdparty/liboqs)
set(OQS_PROVIDER_BUILD_STATIC ON CACHE BOOL "Build a static library instead of a shared library") # Build oqsprovider as a static library (defaults to shared) set(OQS_PROVIDER_BUILD_STATIC ON CACHE BOOL "Build a static library instead of a shared library") # Build oqsprovider as a static library (defaults to shared)
add_subdirectory(3rdparty/oqs-provider) add_subdirectory(3rdparty/oqs-provider)
set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)