cleaned up cmake for S2