Merge pull request #10073 from alalek:cmake_fix_overiding_compile_options
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Nov 2017 11:26:13 +0000 (11:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Nov 2017 11:26:13 +0000 (11:26 +0000)

Trivial merge