Update submodules
CMakeLists cleanup
Untested attempt at fixing the iOS build (see #6972)