Cmake updates

Test pull request builds