Commit 215c6ac6 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contrib: fix compilation of libraries for iOS which deploy cmake

parent bcd00e3b
......@@ -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
;;
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment