CMakeLists.txt updated to work with the last commit.