CmakeLists changes