Small CMakeLists improvements