cmake build script updates

Here, I hope, are the changes I mentioned in the last email...