Add CPack generator switch
Check system architecture for CPack
Clean up