diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-02-09 17:42:11 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-02-09 17:42:11 +0300 |
| commit | f62983f3d22b09683fb83d9aea159d3e482c9f4a (patch) | |
| tree | 8e2a89aa0ab73905ed190d47ee3830752ab8a4ed /src | |
| parent | da7c3654df0fe510f0d658a2d3d3b1cad0fe6543 (diff) | |
| parent | a3dc6a25eb36cb3ac76e5eb720aa0c64fe1819ef (diff) | |
Merge remote-tracking branch 'origin/2.7' into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/CMakeLists.txt | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index cf61cb041..0db43f42d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -203,14 +203,8 @@ target_sources(${APPLICATION_EXECUTABLE} PRIVATE ${PROJECT_SOURCE_DIR}/client.qrc ${PROJECT_SOURCE_DIR}/core_theme.qrc) -generate_theme(${APPLICATION_EXECUTABLE}) -set(theme_dir ${OEM_THEME_DIR}/theme) - -# add executable icon on windows and osx -if(APPLE) - file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon-sidebar.png") - MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}") -endif() +generate_theme(${APPLICATION_EXECUTABLE} OWNCLOUD_SIDEBAR_ICONS) +MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}") ecm_add_app_icon(appIcons ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASENAME "${APPLICATION_ICON_NAME}") target_sources(${APPLICATION_EXECUTABLE} PRIVATE ${appIcons}) @@ -226,9 +220,9 @@ if(NOT APPLE) target_sources(${APPLICATION_EXECUTABLE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/manifest-mingw.rc) endif() else() - file(GLOB _icons "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon.png") + file(GLOB _icons "${OEM_THEME_DIR}/theme/colored/*-${APPLICATION_ICON_NAME}-icon.png") foreach(_file ${_icons}) - string(REPLACE "${theme_dir}/colored/" "" _res ${_file}) + string(REPLACE "${OEM_THEME_DIR}/theme/colored/" "" _res ${_file}) string(REPLACE "-${APPLICATION_ICON_NAME}-icon.png" "" _res ${_res}) install(FILES ${_file} RENAME ${APPLICATION_ICON_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps) endforeach(_file) |