Merge pull request #12165 from deannagarcia/fixWindowsExe

Condition executable name on build system