contrib: fix compilation of libraries for iOS which deploy cmake

diff --git a/contrib/bootstrap b/contrib/bootstrap
index f0bfe917f754163fab4b783895cfa1a3aaa36d13..246e3d6b66edd47f6a9b891ba7fe2c86fc1d7088 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -151,6 +151,24 @@ add_make_enabled()
        done
 }
 
+check_ios_sdk()
+{
+   if test -z "$SDKROOT"
+   then
+      SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk
+      echo "SDKROOT not specified, assuming $SDKROOT"
+   else
+      SDKROOT="$SDKROOT"
+      fi
+
+   if [ ! -d "${SDKROOT}" ]
+   then
+      echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***"
+      exit 1
+   fi
+   add_make "IOS_SDK=${SDKROOT}"
+}
+
 check_macosx_sdk()
 {
    [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
@@ -206,6 +224,7 @@ case "${OS}" in
                        check_macosx_sdk
                        add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                else
+                       check_ios_sdk
                        add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
                fi
                ;;

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 4e568ec9838991b4d9a935217a0383aabffc6bbd..9562165157941ac569a23421676c8018bc8cdba6 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -397,6 +397,9 @@ ifdef HAVE_DARWIN_OS
        echo "set(CMAKE_LD_FLAGS $(LDFLAGS))" >> $@
 ifdef HAVE_IOS
        echo "set(CMAKE_AR ar CACHE FILEPATH "Archiver")" >> $@
+       echo "set(CMAKE_OSX_SYSROOT $(IOS_SDK))" >> $@
+else
+       echo "set(CMAKE_OSX_SYSROOT $(MACOSX_SDK))" >> $@
 endif
 endif
 ifdef HAVE_CROSS_COMPILE

diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c0108113ec6cfeb062697c219d5b7fbc47fa6ad5..8f78df0acf160438fd166b5672243c2cbf27a67f 100755 (executable)
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -136,6 +136,8 @@ export CXX="xcrun clang++"
 export LD="xcrun ld"
 export STRIP="xcrun strip"
 
+export PLATFORM=$PLATFORM
+export SDK_VERSION=$SDK_VERSION
 
 CFLAGS="-isysroot ${SDKROOT} -arch ${ARCH} -miphoneos-version-min=${SDK_MIN} ${OPTIM}"
 if [ "$ARCH" = "armv7" -o "$ARCH" = "armv7s" ]; then