Update cmake to handle bzip2 changes