Merged upstream and added CMake 3.12 support

[kstuart]

As I initially just did this port as an exercise and don't use this software (or Windows for that matter) it's unlikely I'll be making further PRs.

Now that QRL is released it may be time to look at integrating this branch so it can be maintained with the rest of the codebase.