cmakelists tidy up