few more cmake mods..  getting a bit closer.