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