Modern cmake has better support for adding source files and libraries incrementally, so let's use that to clean things up.