More CMake Fiddling

- Still trying to find a good CMake ppa.