fix cmake bug
Merge branch 'master' into print_output