Imported cgilles changes to Cmake