Merge pull request #10200 from alalek:cmake_fix_dependencies