cmake changes
conflict resolved