Ensure cmake file work as subproject
Upgrade xcode project with latest xcode