Skip to content

Commit 8e53836

Browse files
rgrieblrgriebl
committed
WIP: ios build fix
1 parent 7b5fbfd commit 8e53836

4 files changed

Lines changed: 110 additions & 104 deletions

File tree

‎.github/workflows/build_cmake.yml‎

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -43,98 +43,98 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
config:
46-
- name: "Windows Intel 64bit"
47-
artifact: "Windows-x64"
48-
runs-on: windows-2019
49-
os: windows
50-
qt_host: 'windows'
51-
qt_version: '6.6.3'
52-
qt_arch: 'win64_msvc2019_64'
53-
qt_dir: "msvc2019_64"
54-
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
55-
cmake_extra_config: '-DSENTRY=ON'
56-
57-
- name: "Windows ARM 64bit"
58-
artifact: "Windows-ARM64"
59-
runs-on: windows-2019
60-
os: windows
61-
qt_host: 'windows'
62-
qt_host_arch: 'win64_msvc2019_64'
63-
qt_version: '6.6.3'
64-
qt_arch: 'win64_msvc2019_arm64'
65-
qt_dir: "msvc2019_arm64"
66-
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvarsamd64_arm64.bat"
67-
cmake_extra_config: '-DCMAKE_TOOLCHAIN_FILE=%Qt6_DIR%/lib/cmake/Qt6/qt.toolchain.cmake -DQT_HOST_PATH=%Qt6_DIR%/../msvc2019_64'
68-
69-
- name: "Ubuntu 22.04 64bit"
70-
artifact: "Ubuntu-22.04"
71-
runs-on: ubuntu-22.04
72-
os: linux
73-
debian_container: "buildpack-deps:22.04"
74-
75-
- name: "Debian 12 Backend 64bit"
76-
artifact: "Debian-12-Backend"
77-
runs-on: ubuntu-22.04
78-
os: linux
79-
debian_container: "buildpack-deps:bookworm"
80-
cmake_extra_config: "-DBACKEND_ONLY=ON"
81-
generate_docs: true
82-
generate_docker: true
83-
84-
- name: "Linux AppImage 64bit"
85-
artifact: "Linux-AppImage"
86-
runs-on: ubuntu-20.04
87-
os: linux
88-
appimage: true
89-
qt_tools: tools_opensslv3_src
90-
qt_host: 'linux'
91-
qt_version: '6.6.3'
92-
qt_arch: 'gcc_64'
93-
94-
- name: "Ubuntu Snap 64bit"
95-
artifact: "Linux-Snap"
96-
runs-on: ubuntu-22.04
97-
os: linux
98-
snap: true
99-
qt_tools: tools_opensslv3_src
100-
qt_host: 'linux'
101-
qt_version: '6.6.3'
102-
qt_arch: 'gcc_64'
103-
104-
- name: "macOS Universal"
105-
artifact: "macOS"
106-
runs-on: macos-13
107-
os: macos
108-
qt_host: 'mac'
109-
qt_version: '6.6.3'
110-
qt_arch: 'clang_64'
111-
qt_dir: 'macos'
112-
cmake_extra_config: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DSENTRY=ON'
113-
xcode: '15.1' # https://developer.apple.com/forums/thread/740889
114-
115-
- name: "macOS 10 Legacy"
116-
artifact: "macOS-10-Legacy"
117-
runs-on: macos-12
118-
os: macos
119-
qt_host: 'mac'
120-
qt_version: '6.4.3'
121-
qt_arch: 'clang_64'
122-
qt_dir: 'macos'
123-
cmake_extra_config: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DSENTRY=ON'
124-
125-
- name: "Android"
126-
artifact: "Android"
127-
runs-on: ubuntu-20.04
128-
os: android
129-
android_abi: 'arm64-v8a'
130-
android_ndk: '26.2.11394342'
131-
qt_host: 'linux'
132-
qt_host_arch: 'gcc_64'
133-
qt_target: 'android'
134-
qt_version: '6.6.3'
135-
qt_arch: 'android_x86_64'
136-
qt_extra_archs: 'android_arm64_v8a android_armv7 android_x86'
137-
cmake_extra_config: '-DSENTRY=ON'
46+
# - name: "Windows Intel 64bit"
47+
# artifact: "Windows-x64"
48+
# runs-on: windows-2019
49+
# os: windows
50+
# qt_host: 'windows'
51+
# qt_version: '6.6.3'
52+
# qt_arch: 'win64_msvc2019_64'
53+
# qt_dir: "msvc2019_64"
54+
# environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
55+
# cmake_extra_config: '-DSENTRY=ON'
56+
57+
# - name: "Windows ARM 64bit"
58+
# artifact: "Windows-ARM64"
59+
# runs-on: windows-2019
60+
# os: windows
61+
# qt_host: 'windows'
62+
# qt_host_arch: 'win64_msvc2019_64'
63+
# qt_version: '6.6.3'
64+
# qt_arch: 'win64_msvc2019_arm64'
65+
# qt_dir: "msvc2019_arm64"
66+
# environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvarsamd64_arm64.bat"
67+
# cmake_extra_config: '-DCMAKE_TOOLCHAIN_FILE=%Qt6_DIR%/lib/cmake/Qt6/qt.toolchain.cmake -DQT_HOST_PATH=%Qt6_DIR%/../msvc2019_64'
68+
69+
# - name: "Ubuntu 22.04 64bit"
70+
# artifact: "Ubuntu-22.04"
71+
# runs-on: ubuntu-22.04
72+
# os: linux
73+
# debian_container: "buildpack-deps:22.04"
74+
75+
# - name: "Debian 12 Backend 64bit"
76+
# artifact: "Debian-12-Backend"
77+
# runs-on: ubuntu-22.04
78+
# os: linux
79+
# debian_container: "buildpack-deps:bookworm"
80+
# cmake_extra_config: "-DBACKEND_ONLY=ON"
81+
# generate_docs: true
82+
# generate_docker: true
83+
84+
# - name: "Linux AppImage 64bit"
85+
# artifact: "Linux-AppImage"
86+
# runs-on: ubuntu-20.04
87+
# os: linux
88+
# appimage: true
89+
# qt_tools: tools_opensslv3_src
90+
# qt_host: 'linux'
91+
# qt_version: '6.6.3'
92+
# qt_arch: 'gcc_64'
93+
94+
# - name: "Ubuntu Snap 64bit"
95+
# artifact: "Linux-Snap"
96+
# runs-on: ubuntu-22.04
97+
# os: linux
98+
# snap: true
99+
# qt_tools: tools_opensslv3_src
100+
# qt_host: 'linux'
101+
# qt_version: '6.6.3'
102+
# qt_arch: 'gcc_64'
103+
104+
# - name: "macOS Universal"
105+
# artifact: "macOS"
106+
# runs-on: macos-13
107+
# os: macos
108+
# qt_host: 'mac'
109+
# qt_version: '6.6.3'
110+
# qt_arch: 'clang_64'
111+
# qt_dir: 'macos'
112+
# cmake_extra_config: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DSENTRY=ON'
113+
# xcode: '15.1' # https://developer.apple.com/forums/thread/740889
114+
115+
# - name: "macOS 10 Legacy"
116+
# artifact: "macOS-10-Legacy"
117+
# runs-on: macos-12
118+
# os: macos
119+
# qt_host: 'mac'
120+
# qt_version: '6.4.3'
121+
# qt_arch: 'clang_64'
122+
# qt_dir: 'macos'
123+
# cmake_extra_config: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DSENTRY=ON'
124+
125+
# - name: "Android"
126+
# artifact: "Android"
127+
# runs-on: ubuntu-20.04
128+
# os: android
129+
# android_abi: 'arm64-v8a'
130+
# android_ndk: '26.2.11394342'
131+
# qt_host: 'linux'
132+
# qt_host_arch: 'gcc_64'
133+
# qt_target: 'android'
134+
# qt_version: '6.6.3'
135+
# qt_arch: 'android_x86_64'
136+
# qt_extra_archs: 'android_arm64_v8a android_armv7 android_x86'
137+
# cmake_extra_config: '-DSENTRY=ON'
138138

139139
- name: "iOS"
140140
artifact: "iOS"
@@ -143,7 +143,7 @@ jobs:
143143
qt_host: 'mac'
144144
qt_host_arch: 'clang_64'
145145
qt_target: 'ios'
146-
qt_version: '6.7.0'
146+
qt_version: '6.6.0'
147147
qt_arch: 'ios'
148148
cmake_extra_config: ''
149149
xcode: '15.2'

‎CMakeLists.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ if (APPLE)
324324
if (LTO_STATUS)
325325
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-Wl,-object_path_lto -Wl,lto.o")
326326
endif()
327+
set(QT_NO_SET_PLIST_LOCALIZATIONS, ON) # we handle this ourselves
327328
if (IOS)
328329
set_target_properties(${PROJECT_NAME} PROPERTIES
329330
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/macos/Info.ios.plist"
@@ -342,6 +343,12 @@ if (APPLE)
342343
MACOSX_PACKAGE_LOCATION "Resources"
343344
)
344345

346+
set(PRIVACY_INFO "${CMAKE_SOURCE_DIR}/macos/PrivacyInfo.xcprivacy")
347+
target_sources(${PROJECT_NAME} PRIVATE ${PRIVACY_INFO})
348+
set_source_files_properties(${PRIVACY_INFO} PROPERTIES
349+
MACOSX_PACKAGE_LOCATION "Resources"
350+
)
351+
345352
# restrict the number of deployed plugins in static builds
346353
qt_import_plugins(${PROJECT_NAME}
347354
EXCLUDE_BY_TYPE qmltooling
@@ -353,7 +360,6 @@ if (APPLE)
353360
INCLUDE_BY_TYPE sqldrivers
354361
Qt::QSQLiteDriverPlugin
355362
)
356-
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY RESOURCE "macos/PrivacyInfo.xcprivacy")
357363
else()
358364
set_target_properties(${PROJECT_NAME} PROPERTIES
359365
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/macos/Info.macos.plist"

‎macos/Info.ios.plist‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<string>BrickStore</string>
77

88
<key>CFBundleExecutable</key>
9-
<string>@EXECUTABLE@</string>
9+
<string>${EXECUTABLE}</string>
1010

1111
<key>CFBundleIconName</key>
1212
<string>AppIcon</string>
1313

1414
<key>CFBundleIdentifier</key>
15-
<string>@MACOSX_BUNDLE_GUI_IDENTIFIER@</string>
15+
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
1616

1717
<key>CFBundleName</key>
1818
<string>BrickStore</string>
@@ -21,10 +21,10 @@
2121
<string>APPL</string>
2222

2323
<key>CFBundleShortVersionString</key>
24-
<string>@VERSION@</string>
24+
<string>${VERSION}</string>
2525

2626
<key>CFBundleVersion</key>
27-
<string>@BUILD_NUMBER@</string>
27+
<string>${BUILD_NUMBER}</string>
2828

2929
<key>CFBundleDevelopmentRegion</key>
3030
<string>en</string>
@@ -33,7 +33,7 @@
3333
<true/>
3434

3535
<key>MinimumOSVersion</key>
36-
<string>@MACOSX_DEPLOYMENT_TARGET@</string>
36+
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
3737

3838
<key>UILaunchStoryboardName</key>
3939
<string>LaunchScreen</string>

‎macos/Info.macos.plist‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
<string>APPL</string>
1616

1717
<key>NSHumanrReadableCopyright</key>
18-
<string>Copyright © @COPYRIGHT@</string>
18+
<string>Copyright © ${COPYRIGHT}</string>
1919

2020
<key>CFBundleIdentifier</key>
21-
<string>@MACOSX_BUNDLE_GUI_IDENTIFIER@</string>
21+
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
2222

2323
<key>CFBundleSignature</key>
2424
<string>ttxt</string>
2525

2626
<key>CFBundleExecutable</key>
27-
<string>@EXECUTABLE@</string>
27+
<string>${EXECUTABLE}</string>
2828

2929
<key>CFBundleName</key>
3030
<string>BrickStore</string>
3131

3232
<key>CFBundleShortVersionString</key>
33-
<string>@VERSION@</string>
33+
<string>${VERSION}</string>
3434

3535
<key>CFBundleVersion</key>
36-
<string>@BUILD_NUMBER@</string>
36+
<string>${BUILD_NUMBER}</string>
3737

3838
<key>NSCameraUsageDescription</key>
3939
<string>BrickStore needs access to your camera, if you want to identify parts with it.</string>

0 commit comments

Comments
 (0)