Fixing CMakeLists.txt

Committed some hacks by mistake last time.  There is probably a great
way to do fix this in git, but...