[Merge][CMake] Merged revisions : 6612

Revision  r6612
.----------------------
The names of the produced executable were changed in the branch :/
Now the executables with the correct names are built.

.----------------------


[[Imported from SVN: r7156]]