Skip to content

Protobuf AddDescriptors should be removed for all versions of protobu… - #1638

Merged
peternewman merged 1 commit into
OpenLightingProject:0.10from
kripton:protobuf-3.2-fix
May 15, 2020
Merged

Protobuf AddDescriptors should be removed for all versions of protobu…#1638
peternewman merged 1 commit into
OpenLightingProject:0.10from
kripton:protobuf-3.2-fix

Conversation

@kripton

@kripton kripton commented May 14, 2020

Copy link
Copy Markdown
Member

…f since 3.2 instead of 3.7. See #1192 and #1336

#1630 fixed building against protobuf > 3.7. However, some things fixed were also required for versions from 3.2 on already. This PR changes the version numbers of protobuf in the conditionals so it also works with protobuf 3.2 to 3.6.

Tested with protobuf 3.11.4 and all tests PASSED.

@peternewman peternewman added this to the 0.10.8 milestone May 15, 2020

@peternewman peternewman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks @kripton .

@peternewman
peternewman merged commit 2cfbfa4 into OpenLightingProject:0.10 May 15, 2020
@kripton
kripton deleted the protobuf-3.2-fix branch May 15, 2020 17:13
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