[Merge][Cmake] Manually reapplied patch 6654

Revision 6654
.-----------------
Merge sync to keep track with the trunk.

Thanks for renaming files and targets. Always a pleasure to mimic this manually.


[[Imported from SVN: r7365]]