Support for latest CMake (@clemenci)

Marco Cattaneorequested to merge
cherry-pick-681b687d into stripping21-patches

Cherry-picked from !1338 (merged) on 2016-patches, including also !1355 (merged) and !1726 (merged)

Edited by Marco Cattaneo

Merge request reports