More cmake file changes