Re: cmake guideline updates