CMakeLists.txt improvements