Updated submodules for windows cmake work