Skip to content

fix for creating options.h with cmake and WOLFSSL_USER_SETTINGS#6296

Merged
dgarske merged 1 commit intowolfSSL:masterfrom
JacobBarthelmeh:RT1170
Apr 13, 2023
Merged

fix for creating options.h with cmake and WOLFSSL_USER_SETTINGS#6296
dgarske merged 1 commit intowolfSSL:masterfrom
JacobBarthelmeh:RT1170

Conversation

@JacobBarthelmeh
Copy link
Copy Markdown
Contributor

Description

Before cmake builds out of tree with user_settings.h was creating the following options.h:

17 
 18 #undef  WOLFSSL_USER_SETTINGS
 19         -DWOLFSSL_USER_SETTINGS_ASM
 20 #define WOLFSSL_USER_SETTINGS
 21         -DWOLFSSL_USER_SETTINGS_ASM

This adds in the separation between defines which helps the generation function.

@JacobBarthelmeh JacobBarthelmeh self-assigned this Apr 12, 2023
@JacobBarthelmeh
Copy link
Copy Markdown
Contributor Author

Retest this please Jenkins

@dgarske dgarske merged commit 2307b36 into wolfSSL:master Apr 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants