Fixed cmake file after merge