Simplify and fix setting of CPACK_PACKAGE_FILE_NAME