Merge pull request #7531 from dtmoodie:cmake_updates