Merge pull request #10326 from alalek:cmake_fixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 15 Dec 2017 22:26:00 +0000 (22:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 15 Dec 2017 22:26:00 +0000 (22:26 +0000)

Trivial merge