[Merge][CMake] Block revision r1595

Initial message was : synced with trunk

Bugfix: initialize data member from constructor argument.

Thanks to Andreas Lauser for pointing this out.


[[Imported from SVN: r1810]]