Finalised CMakeLists