Improving CMakeLists.txt