merge of cmake changes into the stacks only branch