CMake cleanups
0.1.8