A bit more line-ending adjustment.  Addtl mods to CMakeLists.