#408, Update patch for newer code/CMakeLists.txt

This fill fix #308