Merge pull request #12897 from alalek:cmake_deprecate_pkgconfig_3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Nov 2018 20:53:18 +0000 (20:53 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Nov 2018 20:53:18 +0000 (20:53 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge