Fix cmake for last trunk updsates