Updating CMakeLists with tabulation