Fixing CMake deprecation warning
Merge branch 'cmake-fix'