Updated packaging scripts for Windows to take into account CMake cleanup in d97af06f0a