Updated the cmake for the project.

Just revisited a few things to address Karthik's comments.