Merge pull request #8175 from alalek:cmake_cleanup_defines
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Feb 2017 10:59:09 +0000 (10:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Feb 2017 10:59:09 +0000 (10:59 +0000)

Trivial merge