tidied up cmake file a bit