Merge pull request #5884 from alalek:cmake_vars
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Sun, 17 Jan 2016 09:43:17 +0000 (09:43 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Sun, 17 Jan 2016 09:43:17 +0000 (09:43 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge