Merge pull request #23039 from alalek:cmake_3.5_fix