Update to modifications in submodule cmake.