VS 2015 compile patch

Please find attached a patch to fix building with CMake using MSVC 2015.

This was extracted and modified from

Please consider merging this. If there's a better way to submit code
changes (Github?) please let me know.

Best,
Michael

vs_2015_cmake.patch (4.44 KB)