Improve cmake files