pick d599788 upstream cmake patch
