Move CM_EXTRAVERSION to the end of CM_VERSION