minor changes for selecting cpp version