Fixed up cmake file a bit more...