Reorganize the CMakefile.

Whoops ... looks like I forgot to check this in, previously. Oww.
Merge pull request #623 from linas/bld

Reorganize the CMakefile.