summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Bounds <jesse@rebounds.net>2017-02-15 10:43:40 -0800
committerJesse Bounds <jesse@rebounds.net>2017-02-16 10:59:54 -0800
commit655b7c035cbeb4fe6f012ea59a715c4cc976e10a (patch)
treedebe735e50a9a423e39466a773dea4d74c941624
parent06eebd3793b1e06acf1e3df1a2e978d4d6674e72 (diff)
downloadqtlocation-mapboxgl-655b7c035cbeb4fe6f012ea59a715c4cc976e10a.tar.gz
[ios] Search for ICU path using cmake cache
-rwxr-xr-xplatform/ios/scripts/package.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index 0ad7bb93d8..e4403c4652 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -117,7 +117,7 @@ if [[ ${BUILD_FOR_DEVICE} == true ]]; then
-o ${OUTPUT}/static/${NAME}.framework/${NAME} \
${LIBS[@]/#/${PRODUCTS}/${BUILDTYPE}-iphoneos/lib} \
${LIBS[@]/#/${PRODUCTS}/${BUILDTYPE}-iphonesimulator/lib} \
- `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojson.a`
+ `cmake -LA -N ${DERIVED_DATA} | grep MASON_PACKAGE_icu_LIBRARIES | cut -d= -f2`
cp -rv ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.bundle ${STATIC_BUNDLE_DIR}
fi
@@ -157,7 +157,7 @@ else
libtool -static -no_warning_for_no_symbols \
-o ${OUTPUT}/static/${NAME}.framework/${NAME} \
${LIBS[@]/#/${PRODUCTS}/${BUILDTYPE}-iphonesimulator/lib} \
- `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojson.a`
+ `cmake -LA -N ${DERIVED_DATA} | grep MASON_PACKAGE_icu_LIBRARIES | cut -d= -f2`
cp -rv ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.bundle ${STATIC_BUNDLE_DIR}
fi