From 55a15a1c1b93d36d705fc69e44b5c806b807dd55 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 8 Apr 2019 17:23:57 +0200 Subject: Add initial support for cross-building to iOS Tested locally with the following configurations: - iOS device builds (arm64) - iOS simulator builds (x86_64) - iOS simulator_and_device builds (fat arm64 and x86_64 archives) All iOS builds currently require a custom vcpkg fork which contains fixes for building the required 3rd party libraries. qtsvg, qtdeclarative, qtgraphicaleffects and qtquickcontrols2 have also been tested to build successfully. simulator_and_device builds are also supported, but require an umerged patch in upstream CMake as well as further patches to vcpkg. Task-number: QTBUG-75576 Change-Id: Icd29913fbbd52a60e07ea5253fd9c7af7f8ce44c Reviewed-by: Cristian Adam Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert --- src/plugins/platforms/ios/optional/CMakeLists.txt | 6 +++++ .../optional/nsphotolibrarysupport/CMakeLists.txt | 30 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/plugins/platforms/ios/optional/CMakeLists.txt create mode 100644 src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt (limited to 'src/plugins/platforms/ios/optional') diff --git a/src/plugins/platforms/ios/optional/CMakeLists.txt b/src/plugins/platforms/ios/optional/CMakeLists.txt new file mode 100644 index 0000000000..a3807bee6c --- /dev/null +++ b/src/plugins/platforms/ios/optional/CMakeLists.txt @@ -0,0 +1,6 @@ +# Generated from optional.pro. + + +if(APPLE_IOS) + add_subdirectory(nsphotolibrarysupport) +endif() diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt new file mode 100644 index 0000000000..5adac3cabb --- /dev/null +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from nsphotolibrarysupport.pro. + +##################################################################### +## qiosnsphotolibrarysupport Plugin: +##################################################################### + +add_qt_plugin(qiosnsphotolibrarysupport + TYPE platforms/darwin + CLASS_NAME QIosOptionalPlugin_NSPhotoLibrary + SOURCES + plugin.mm + qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm + qiosfileenginefactory.h + qiosimagepickercontroller.h qiosimagepickercontroller.mm + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + ${FWAssetsLibrary} + ${FWFoundation} + ${FWUIKit} + Qt::Core + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:nsphotolibrarysupport.pro:: +# OTHER_FILES = "plugin.json" +# PLUGIN_EXTENDS = "-" + +## Scopes: +##################################################################### -- cgit v1.2.3