Use it instead of my previous patch? Tested on updated today Arch linux, it will be nice if it will not break ubuntu 16.04 (i tried to set cmake version to 3.5.1)