fixed cmake version macro and string handling
5 files changed