qt5 porting#2
Conversation
|
Which variables are you talking about. The ones in the CMakeLists truely look obsolete, since gecode is already added via the dependency moreorg (see the associated pc file) |
39ccd54 to
5f4ee50
Compare
|
GECODE_LIBRARIES was used but never set, but you are right, moreorg does provide includes and libraries, so i just removed that variable. |
|
@2maz you want to review and merge this? |
|
@pierrewillenbrockdfki do you have a buildconf that you use for testing? I encountered several issues while building. Also templ-gui does not run, and requires gecode's gist.h to be excluded - since that requires qt4 still. |
A buildconf is being worked on. I suspect the feature/qt5 branch of https://github.com/rock-core/rock-package_set helps already. |
Turns out gecode will pick qt4 over qt5 if given a choice, so some more changes will be required in rock-core/rock-package_set. |
|
We should try first with Gecode's release/6.3.0 branch - it comes with a few updates on the Qt side. |
If you want to try that, there is a gecode-6.3.0 branch in https://github.com/pierrewillenbrockdfki/rock_core_rock_package_set.git (alongside a feature/qt5 branch that contains an attempt to have gecode compile against qt5 in the presence of qt4) gecode-6.3.0 also is preferred on gentoo since 6.2.0 does have some trouble compiling with newer compilers. I cannot really tell if it works right, though. It looks like there is only planning/templ => knowledge_reasoning/moreorg => tools/gecode in terms of users, so maybe you can take a look? |
|
@2maz , did you have a chance to look at this again? |
|
I did now run the integration tests for knowledge_reasoning/moreorg and planning/templ against gecode 6.3.0 and both pass, so i will go ahead and prepare the update to gecode 6.3.0 and split the patches for that out of this PR. |
…-fixes Compile fixes
gecode is found and provided by moreorg and it is never set in this project.
5f4ee50 to
2bb9917
Compare
|
@2maz, i did the merge of the compile fixes to main, i don't think those can harm things. the update to gecode 6.3.0 is pending in rock-core/rock-package_set. the qt5 changes there will have to wait a bit until the gecode update lands. |
|
@pierrewillenbrockdfki without being too strict and enforcing it, we should try to make a relevant Github CI pipeline run and succeed before a merge to main - so rather create/work with a feature branch on the repo. For a merge request against 'main' you should also grant a bit longer response time window. |
|
@pierrewillenbrockdfki adapted the Docker-based CI setup so that:
|
@2maz this is supposed to be merged onto a branch named "feature/qt5", but i don't see github allowing to request that kind of repository change from a pull request, so that branch would have to be created beforehand.
This PR basically contains some build fixes and a port to qt5.
The gecode situation is strange, i cannot find where the configuration variables would be set, but the code seems to need it?