add cmake patch
Rebase from 'upstream'
add cmake patch