matching cmake files
companion to cyclus' agent test updatE
updating cmake files to match cyclus
Merge branch 'gidden-at' into develop