Merge pull request #4432 from haydenroche5/cmake_user_settings

Don't automatically set BUILD_ED25519_SMALL and BUILD_CURVE25519_SMALL in the  CMake build when using user_settings.h.
This commit is contained in:
David Garske
2021-09-28 14:01:39 -07:00
committed by GitHub

View File

@ -84,9 +84,7 @@ function(generate_build_flags)
if(WOLFSSL_ED25519 OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_ED25519 OR WOLFSSL_USER_SETTINGS)
set(BUILD_ED25519 "yes" PARENT_SCOPE) set(BUILD_ED25519 "yes" PARENT_SCOPE)
endif() endif()
if(WOLFSSL_ED25519_SMALL OR WOLFSSL_USER_SETTINGS) set(BUILD_ED25519_SMALL ${WOLFSSL_ED25519_SMALL} PARENT_SCOPE)
set(BUILD_ED25519_SMALL "yes" PARENT_SCOPE)
endif()
if(WOLFSSL_FEMATH OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_FEMATH OR WOLFSSL_USER_SETTINGS)
set(BUILD_FEMATH "yes" PARENT_SCOPE) set(BUILD_FEMATH "yes" PARENT_SCOPE)
endif() endif()
@ -96,9 +94,7 @@ function(generate_build_flags)
if(WOLFSSL_CURVE25519 OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_CURVE25519 OR WOLFSSL_USER_SETTINGS)
set(BUILD_CURVE25519 "yes" PARENT_SCOPE) set(BUILD_CURVE25519 "yes" PARENT_SCOPE)
endif() endif()
if(WOLFSSL_CURVE25519_SMALL OR WOLFSSL_USER_SETTINGS) set(BUILD_CURVE25519_SMALL ${WOLFSSL_CURVE25519_SMALL} PARENT_SCOPE)
set(BUILD_CURVE25519_SMALL "yes" PARENT_SCOPE)
endif()
if(WOLFSSL_ED448 OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_ED448 OR WOLFSSL_USER_SETTINGS)
set(BUILD_ED448 "yes" PARENT_SCOPE) set(BUILD_ED448 "yes" PARENT_SCOPE)
endif() endif()