fixed lbrary order in cmake files
Merge branch 'master' into codegen