cmake generation fixes
Merge branch 'master' of github.com:ARMmbed/yotta into yotta3