Skip to content

CI: Fix iOS Build #11938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

CI: Fix iOS Build #11938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions cmake/find-modules/FindGStreamer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,21 @@ elseif(IOS)
elseif(EXISTS "~/Library/Developer/GStreamer/iPhone.sdk/GStreamer.framework")
set(GSTREAMER_PREFIX_IOS "~/Library/Developer/GStreamer/iPhone.sdk/GStreamer.framework")
else()
FetchContent_Declare(gstreamer
DOWNLOAD_EXTRACT_TIMESTAMP true
include(CPM)
CPMAddPackage(
NAME gstreamer
URL "https://gstreamer.freedesktop.org/data/pkg/ios/${QGC_GST_TARGET_VERSION}/gstreamer-1.0-devel-${QGC_GST_TARGET_VERSION}-ios-universal.pkg"
)
FetchContent_MakeAvailable(gstreamer)
set(GSTREAMER_PREFIX_IOS ${gstreamer_SOURCE_DIR})
endif()
set(GSTREAMER_PREFIX ${GSTREAMER_PREFIX_IOS})
set(ENV{PKG_CONFIG_LIBDIR} "${GSTREAMER_PREFIX}/lib/pkgconfig:${GSTREAMER_PREFIX}/lib/gstreamer-1.0/pkgconfig")
list(APPEND PKG_CONFIG_ARGN
--dont-define-prefix
--define-variable=prefix=${GSTREAMER_PREFIX}
--define-variable=libdir=${GSTREAMER_PREFIX}/lib
--define-variable=includedir=${GSTREAMER_PREFIX}/include
)
elseif(ANDROID)
set(GSTREAMER_ARCHIVE "gstreamer-1.0-android-universal-${QGC_GST_TARGET_VERSION}.tar.xz")
include(CPM)
Expand Down
52 changes: 52 additions & 0 deletions deploy/ios/Info.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundlePackageType</key>
<string>APPL</string>

<key>CFBundleName</key>
<string>@MACOSX_BUNDLE_BUNDLE_NAME@</string>

<key>CFBundleDisplayName</key>
<string>@MACOSX_BUNDLE_BUNDLE_NAME@</string>

<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>

<key>CFBundleIdentifier</key>
<string>@MACOSX_BUNDLE_GUI_IDENTIFIER@</string>

<key>CFBundleVersion</key>
<string>@MACOSX_BUNDLE_BUNDLE_VERSION@</string>

<key>CFBundleShortVersionString</key>
<string>@MACOSX_BUNDLE_SHORT_VERSION_STRING@</string>

<key>CFBundleIconFile</key>
<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>

<key>MinimumOSVersion</key>
<string>${IPHONEOS_DEPLOYMENT_TARGET}</string>

<key>ITSAppUsesNonExemptEncryption</key>
<false/>

<key>LSRequiresIPhoneOS</key>
<true/>

<key>NSHighResolutionCapable</key>
<true/>

<key>UILaunchStoryboardName</key>
<string>AppLaunchScreen</string>

<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
5 changes: 3 additions & 2 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ add_subdirectory(Camera)
add_qgc_test(QGCCameraManagerTest)

add_subdirectory(Comms)
add_qgc_test(QGCSerialPortInfoTest)

if(NOT QGC_NO_SERIAL_LINK)
add_qgc_test(QGCSerialPortInfoTest)
endif()
add_subdirectory(FactSystem)
add_qgc_test(FactSystemTestGeneric)
add_qgc_test(FactSystemTestPX4)
Expand Down
13 changes: 9 additions & 4 deletions test/Comms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
find_package(Qt6 REQUIRED COMPONENTS Core Qml Test)

qt_add_library(CommsTest STATIC
QGCSerialPortInfoTest.cc
QGCSerialPortInfoTest.h
)
qt_add_library(CommsTest STATIC)

if(NOT QGC_NO_SERIAL_LINK)
target_sources(CommsTest
PRIVATE
QGCSerialPortInfoTest.cc
QGCSerialPortInfoTest.h
)
endif()

target_link_libraries(CommsTest
PRIVATE
Expand Down
8 changes: 6 additions & 2 deletions test/UnitTestList.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
#include "QGCCameraManagerTest.h"

// Comms
#ifndef NO_SERIAL_LINK
#include "QGCSerialPortInfoTest.h"
#endif

// FactSystem
#include "FactSystemTestGeneric.h"
Expand Down Expand Up @@ -134,8 +136,10 @@ int runTests(bool stress, QStringView unitTestOptions)
// Camera
UT_REGISTER_TEST(QGCCameraManagerTest)

// Comms
UT_REGISTER_TEST(QGCSerialPortInfoTest)
// Comms
#ifndef NO_SERIAL_LINK
UT_REGISTER_TEST(QGCSerialPortInfoTest)
#endif

// FactSystem
UT_REGISTER_TEST(FactSystemTestGeneric)
Expand Down