more cmake work