Merge pull request #1565 from SpecLad:cmake-new-ptr