[Merge][CMake] Block revision r6654

Initial message was : Merge sync to keep track with the trunk.

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


[[Imported from SVN: r7186]]