Merge two subroutines that were forked from each other long ago, and diverged a bit.

This allowed me to easily add support for CMake 2.4.3's progress output, without dropping support for unsermake's progress output (and made the code easier to read as well).