Merge pull request #1742 from scivision/cmake

CMake: modernize