Consider the built-in typenames too.
Merge pull request #13 from smspillaz/common-universal-cmake.item_12

Consider the built-in typenames too.