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

wolfMQTT Release v1.14.1 preparation #308

Merged
merged 1 commit into from
Aug 31, 2022
Merged

Conversation

embhorn
Copy link
Member

@embhorn embhorn commented Aug 31, 2022

Also revert vs_settings.h change in #305

@embhorn embhorn self-assigned this Aug 31, 2022
@embhorn embhorn requested a review from dgarske August 31, 2022 20:14
#if !defined(HAVE_CONFIG_H) && !defined(BUILDING_CMAKE)

/* Don't include this if using autoconf cross-compile */
#if !defined(HAVE_CONFIG_H)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This BUILDING_CMAKE fixed a vcpkg issue. Do you have a plan for how to fix this in vcpkg with Windows Cmake? I was not able to get the vcpkg update through without it. See microsoft/vcpkg#25936

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'll have to figure something else out. That change definitely breaks vcpkg / VS builds.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From zd14640

The problem was as I explained earlier; the config used to build the wolfMQTT library in vcpkg was different from the config the application was using. I was able to resolve the issue by removing the section of the diff patch that changes wolfmqtt/vs_settings.h

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine, but you will likely need to find another solution for the vcpkg CI tests with wolfMQTT and Windows.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And that will likely require a patch to the vcpkg.

@dgarske dgarske assigned dgarske and unassigned embhorn Aug 31, 2022
@dgarske dgarske merged commit f657f8d into wolfSSL:master Aug 31, 2022
@chenrui333
Copy link

Just heads up, this merge build needs a rerun.

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.

3 participants