bowhan Improve/refactor cmake (#26)