fix broken cmake for reshuffled messages.