cmake cleanup, move back to boost regex from std