openrave icon indicating copy to clipboard operation
openrave copied to clipboard

Published 20 hours ago • verified publisher icon rdiankov

fix qt4 conflict with boost

Open lianghongzhuo opened this issue 4 years ago • 7 comments

This pull request contains two prats: some fix from @cielavenir and qt4 conflict with boost For the qt4 and boost conflict, you can see here as a reference. https://github.com/LARG/HFO/issues/79#issuecomment-482526111

lianghongzhuo avatar May 10 '20 11:05 lianghongzhuo

ref

https://github.com/rdiankov/openrave/pull/706 https://github.com/rdiankov/openrave/pull/708 https://github.com/rdiankov/openrave/commits/noboostpythonIfPybind -> #796

cielavenir avatar May 11 '20 02:05 cielavenir

@lianghongzhuo force PythonInterp to 2 exists only for testing. It is not for mainstream.

cielavenir avatar May 11 '20 02:05 cielavenir

@lianghongzhuo actually I recommend you to resubmit pull request only using qt4 guy (here 67aa72d)

cielavenir avatar May 11 '20 02:05 cielavenir

@cielavenir Sorry, I didn't know you already submit your commits.

  1. I will modify this pull request that only leave qt4 commits.
  2. Keep all commits in this pull request and revise if needed. which one do you prefer?

lianghongzhuo avatar May 11 '20 06:05 lianghongzhuo

@lianghongzhuo sorry if I misunderstand what you mean, but please force-push https://github.com/rdiankov/openrave/pull/795/commits/67aa72da9120c073553deb3e75202ffd1516bbb6 on the branch-point of your branch, removing other commits

cielavenir avatar May 12 '20 08:05 cielavenir

OK

lianghongzhuo avatar May 12 '20 09:05 lianghongzhuo

I think it looks better now. :)

lianghongzhuo avatar May 12 '20 09:05 lianghongzhuo