Tidy up CMakeLists.txt