Updated the cmake file.
Changed files accoridngly to last commit.