Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Innolectric CMake changes #7188

Merged
merged 4 commits into from
Feb 5, 2024
Merged

Innolectric CMake changes #7188

merged 4 commits into from
Feb 5, 2024

Conversation

innolectric
Copy link

Description

slight changes to CMake setup to integrate it into our build. To achieve this we added following variables to control CMake

  • "WOLFSSL_INSTALL", encapsulate install target. If CMake install is present it requires every target to be installable. But our targets can not be installed.
  • WOLFSSL_X86_64_BUILD. x86 Assembler code is not build on non-x86-Builds. This way we do not need to integrate additional shell script in build system.
  • "WOLFSSL_X86_64_BUILD_ASM" is used within our X86 based software tests. We do have several unit / integration tests that are tested on developer computers directly after cross-compiled binaries are being build. Without this change x86 based builds were not possible.

Testing

We can build wolfSSL for ARM and X86 platforms

Checklist

  • added tests
  • updated/added doxygen
  • updated appropriate READMEs
  • Updated manual and documentation

@wolfSSL-Bot
Copy link

Can one of the admins verify this patch?

@dgarske
Copy link
Contributor

dgarske commented Jan 30, 2024

Okay to test. Working on getting contributor agreement setup.

@kareem-wolfssl
Copy link
Contributor

kareem-wolfssl commented Jan 30, 2024

FYI - approved contributor agreement on file, see ZD 16728 and 17396.

@dgarske
Copy link
Contributor

dgarske commented Jan 30, 2024

Retest this please.

@douzzer douzzer merged commit 2b33079 into wolfSSL:master Feb 5, 2024
108 checks passed
@dgarske
Copy link
Contributor

dgarske commented Feb 6, 2024

FYI: This breaks make install and cmake --install .. I suspect MANY CMake users will not like this.
Took me a few hours to trace down why my wolfTPM CMake test was failing.
Apparently we added a new "WOLFSSL_INSTALL" option? This NEEDS to be clearly documented in the INSTALL file.

@dgarske
Copy link
Contributor

dgarske commented Feb 6, 2024

@douzzer please resolve.

Either:
Add -DWOLFSSL_INSTALL=yes to the INSTALL CMake instructions.
OR
Change the behavior to default to install and new option to disable the install. Like -DWOLFSSL_NO_INSTALL=yes

@dgarske
Copy link
Contributor

dgarske commented Feb 6, 2024

See: wolfSSL/wolfTPM#329

douzzer added a commit to douzzer/wolfssl that referenced this pull request Feb 6, 2024
…WOLFSSL_INSTALL=no, to restore status quo ante. see wolfSSL#7188
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.

5 participants