Updated CMake files to match the latest modifications in source tree