Updates to CMakeLists.