#1036 Updated CMakeLists.txt formatting