more cmake refactoring
more cmake refactoring