improved cmake files
merged conflicts in cmake files