Fixed up cmake build scripts for linux/gcc 4.8.2