Rwork patch for new version to ensure that the .cmake files are placed in the proper place. Fixup .cmake files to remove references to paths on my system.
