Changed CMakeLists to just one