Merge pull request #4752 from Orphis/cmake_cleanup cmake: Improve support for multi-configuration generators
