Oops, had forgotten to update some of our CMake files!