Merge conflicts?

Yes, because @phkahler already merged #1154 and you included those two commits in here as well.

By the way your Eigen branch also has them.

wait, how did the merge happen that I got conflicts from child commits? Did the commits get squashed or something that changed the ID?

ok well fixed that.

wait, how did the merge happen that I got conflicts from child commits? Did the commits get squashed or something that changed the ID?

I don't know but the commit IDs "always" end up different on the master branch after merging. I thought it was normal?

Only if rebased or squashed. If it's a straight "merge" then the commit ID should exist in the history. Anyway, this is ready to review.

Who has done most of it? I think this is one of the few projects that I contribute to that I haven't been the main person behind the build system maintenance... Usually that's how I get hooked. (That's why MeshLab has CMake instead of qmake now and can use system installed dependencies, etc)

Who has done most of it?

Whitequark. All the way back to 2015 when she added it 5db5f1e until she left.

Since I don't know anything about CMake - beyond the little I learned to build SolveSpace I can't help you with this.

Who has done most of it? I think this is one of the few projects that I contribute to that I haven't been the main person behind the build system maintenance...

Well since whitequark departed I'd say it's been @ppd followed by @vespakoen. I figured people knew that since someone requested their review on this one? ;-)

Oh I just clicked the suggested people from GitHub 😁

Rebased for cleanliness.

@rpavlik Going to close this since the commits were merged as part of the PR that built on this one. You can reopen if that's not quite right.

Cool thanks!