Move CMake work into a more appropriate place

SVN-Revision: 43497