Cmake cosmetics

My warm up round with pull requests ;-)