Changes for fcppt and cmake cleanup