Merge pull request #10087 from mshabunin:small-cmake-fixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 18 Nov 2017 18:07:14 +0000 (18:07 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 18 Nov 2017 18:07:14 +0000 (18:07 +0000)

Trivial merge