restored cmake build after roll-back