Updated CMake files