boost addition and some cmake reorg