cmake: support 2.8.7
Merge branch 'master' into 2.x