CMake build update - fix MSVC compilation