Tightens the regex for versioned SDK directories to look for a slash followed by a "v" to avoid matching the WiX path, which we do not want to mangle.
Also fixes a CMake warning about mismatched conditional end labels in the same code.
Fixes #4108 (closed)