From e301a75ea3391d6a15fa421fc46826da8ab91967 Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 9 Feb 2021 11:05:21 +0000 Subject: [PATCH] CMake: Allow custom xcassets folder to be used, without specifying ICON_BIG or ICON_SMALL --- extras/Build/CMake/JUCEUtils.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake index 6b1003cf68..ae5dec2294 100644 --- a/extras/Build/CMake/JUCEUtils.cmake +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -987,10 +987,6 @@ function(_juce_generate_icon source_target dest_target) get_target_property(juce_property_icon_big ${source_target} JUCE_ICON_BIG) get_target_property(juce_property_icon_small ${source_target} JUCE_ICON_SMALL) - if(NOT (juce_property_icon_big OR juce_property_icon_small)) - return() - endif() - set(icon_args) if(juce_property_icon_big) @@ -1004,17 +1000,25 @@ function(_juce_generate_icon source_target dest_target) set(generated_icon) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + if(NOT icon_args) + return() + endif() + set(generated_icon "${juce_library_code}/Icon.icns") # To get compiled properly, we need the icon before the plist is generated! _juce_execute_juceaide(macicon "${generated_icon}" ${icon_args}) set_source_files_properties(${generated_icon} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + if(NOT icon_args) + return() + endif() + set(generated_icon "${juce_library_code}/icon.ico") _juce_execute_juceaide(winicon "${generated_icon}" ${icon_args}) elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") get_target_property(generated_icon ${source_target} JUCE_CUSTOM_XCASSETS_FOLDER) - if(NOT generated_icon) + if(icon_args AND (NOT generated_icon)) set(out_path "${juce_library_code}/${dest_target}") set(generated_icon "${out_path}/Images.xcassets") @@ -1022,6 +1026,10 @@ function(_juce_generate_icon source_target dest_target) _juce_execute_juceaide(iosassets "${out_path}" ${icon_args}) endif() + if(NOT generated_icon) + return() + endif() + set_target_properties(${dest_target} PROPERTIES XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon")