CMakefiles updated