Simplify iOS detection: check CMAKE_OSX_SYSROOT is equal to iphoneos
Merge branch 'update' into update.macosx