Cleaned up the CMakeLists