CMakeLists improvements