cmake: macros fixup
cleanup boost fixup
boost: fixup