modifications for cmake changes