mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

CMake: Prefer using launch storyboard on iOS even when a custom xcassets folder is set

Browse source
This commit is contained in:
attila 2022-08-05 11:26:36 +02:00
parent acc6addb86
commit ba8d5e3e1c
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/CMake API.md
View file

@ -331,12 +331,14 @@ attributes directly to these creation functions, rather than adding them later.
`LAUNCH_STORYBOARD_FILE` `LAUNCH_STORYBOARD_FILE`
- A custom launch storyboard file to use on iOS. If not supplied, a default storyboard will be - A custom launch storyboard file to use on iOS. If not supplied, a default storyboard will be
used. used. If this is specified, then this will take precedence over a LaunchImage inside a custom
xcassets directory.
`CUSTOM_XCASSETS_FOLDER` `CUSTOM_XCASSETS_FOLDER`
- A path to an xcassets directory, containing icons and/or launch images for this target. If this - A path to an xcassets directory, containing icons and/or launch images for this target. If this
is specified, the ICON_BIG and ICON_SMALL arguments will not have an effect on iOS, and a launch is specified, the ICON_BIG and ICON_SMALL arguments will not have an effect on iOS. LaunchImages
storyboard will not be used. have been deprecated from iOS 13 onward, but if your xcassets folder contains a LaunchImage and
a custom storyboard hasn't been specified, then it will be used.
`TARGETED_DEVICE_FAMILY` `TARGETED_DEVICE_FAMILY`
- Specifies the device families on which the product must be capable of running. Allowed values - Specifies the device families on which the product must be capable of running. Allowed values

3
extras/Build/CMake/JUCEUtils.cmake
View file

@ -1344,10 +1344,11 @@ function(_juce_set_fallback_properties target)
_juce_set_property_if_not_set(${target} BUILD_VERSION "${final_version}") _juce_set_property_if_not_set(${target} BUILD_VERSION "${final_version}")
get_target_property(custom_xcassets ${target} JUCE_CUSTOM_XCASSETS_FOLDER) get_target_property(custom_xcassets ${target} JUCE_CUSTOM_XCASSETS_FOLDER)
get_target_property(custom_storyboard ${target} JUCE_LAUNCH_STORYBOARD_FILE)
set(needs_storyboard TRUE) set(needs_storyboard TRUE)
if(custom_xcassets) if((NOT custom_storyboard) AND custom_xcassets AND (EXISTS "${custom_xcassets}/LaunchImage.launchimage"))
set(needs_storyboard FALSE) set(needs_storyboard FALSE)
endif() endif()