cmake: a bit of packaging work