more cmake cleanup
4 files changed