Modified cmake build file to reflect recent changes.

Needs testing & review.
Modified doxygen build file for cmake building.