Updated in line with CMake changes in super-project.