From 4bbffa4c5ef7dbf2b4b4ad636ef4d3901532af6a Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 2 Feb 2021 15:48:30 +0100 Subject: Fix branded mac sidebar icons --- cmake/modules/OCGenerateTheme.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/modules/OCGenerateTheme.cmake b/cmake/modules/OCGenerateTheme.cmake index 86381ad69..3913f4a09 100644 --- a/cmake/modules/OCGenerateTheme.cmake +++ b/cmake/modules/OCGenerateTheme.cmake @@ -30,7 +30,7 @@ function(__addIcon THEME ICON_NAME) endif() endfunction() -function(generate_theme TARGET) +function(generate_theme TARGET OWNCLOUD_SIDEBAR_ICONS_OUT) if(NOT "${OEM_THEME_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") set(QRC ${CMAKE_BINARY_DIR}/theme.qrc) file(WRITE "${QRC}" "\n\n") @@ -46,7 +46,12 @@ function(generate_theme TARGET) endforeach() file(APPEND "${QRC}" "\n\n") target_sources(${TARGET} PRIVATE ${QRC}) + # add executable icon on windows and osx + file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${OEM_THEME_DIR}/theme/colored/*-${APPLICATION_ICON_NAME}-sidebar.png") + else() + file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${OEM_THEME_DIR}/theme/colored/*-${APPLICATION_ICON_NAME}-icon-sidebar.png") endif() + set(${OWNCLOUD_SIDEBAR_ICONS_OUT} ${OWNCLOUD_SIDEBAR_ICONS} PARENT_SCOPE) endfunction() -- cgit v1.2.3