More CMakeification