Some cmake changes.