Missing CMakeLists.txt changes from the previous commit.