Updating CMakeLists.txt to get things to build under cmake.