cmake: third rebase