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

chore(cpn): fetch maxlibqt from forked repo at compile time #4249

Merged
merged 11 commits into from
Oct 27, 2023

Conversation

elecpower
Copy link
Collaborator

@elecpower elecpower commented Oct 26, 2023

Summary of changes:

  • use source from EdgeTX/maxLibQt fork
  • modify cmake to reference repo
  • remove mixed OpenTx implementation

@elecpower elecpower added the companion Related to the companion software label Oct 26, 2023
@elecpower elecpower changed the title chore(cpn): move maxlibqt to 3rd party chore(cpn): move maxlibqt fully to thirdparty Oct 26, 2023
@raphaelcoeffic
Copy link
Member

fix bug locally as repo not being actively maintained

Wouldn't it make more sense to fork that repo, add our changes in form of commits on that repo, and either use CMake FetchContent (preferred) or submodule to pull that code?

@elecpower
Copy link
Collaborator Author

fix bug locally as repo not being actively maintained

Wouldn't it make more sense to fork that repo, add our changes in form of commits on that repo, and either use CMake FetchContent (preferred) or submodule to pull that code?

That would provide better attribution but would need an EdgeTx admin to fork and grant permissions for devs to modify.

@raphaelcoeffic
Copy link
Member

would need an EdgeTx admin to fork and grant permissions for devs to modify

I forked the repo into EdgeTX Org and invited you as "Maintainer".

@elecpower
Copy link
Collaborator Author

Merged fix for the conditional test into maxLibQt forked repo PR#1

@elecpower
Copy link
Collaborator Author

Merged fix for the macos compile error into maxLibQt forked repo EdgeTX/maxLibQt#2

@elecpower elecpower marked this pull request as draft October 26, 2023 11:16
@elecpower elecpower marked this pull request as ready for review October 26, 2023 12:27
@elecpower
Copy link
Collaborator Author

@raphaelcoeffic revamped to fetch patched forked repo

@elecpower elecpower changed the title chore(cpn): move maxlibqt fully to thirdparty chore(cpn): fetch maxlibqt from forked repo at compile time Oct 26, 2023
@raphaelcoeffic
Copy link
Member

raphaelcoeffic commented Oct 26, 2023

@elecpower would you mind if I make a linear history out of your merges on that new repo? I believe it would be easier to handle in case the upstream repo ever gets updated.

Edit: done

@pfeerick pfeerick added the house keeping 🧹 Cleanup of code and house keeping label Oct 27, 2023
@pfeerick pfeerick added this to the 2.10 milestone Oct 27, 2023
@pfeerick pfeerick force-pushed the elecpower/maxlibqt-move-to-3rd-party branch from 26a57c7 to f2b6d3f Compare October 27, 2023 05:03
@pfeerick pfeerick merged commit a891c5e into main Oct 27, 2023
40 checks passed
@pfeerick pfeerick deleted the elecpower/maxlibqt-move-to-3rd-party branch October 27, 2023 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
companion Related to the companion software house keeping 🧹 Cleanup of code and house keeping
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants