More CPack install fix for windows