Updated cmakefiles
Updated cmakefiles[2]