Cleaned up CMakeLists.txt a bit