Generate index.theme unconditionally to fix qrc/rcc

Related to c39caf44b2e20a76b7d6f70735b203b17d1b85a0 which broke the icons eg. on Windows
This commit is contained in:
Julius Künzel 2024-11-17 09:54:26 +01:00
parent a91b0ad8df
commit 4e8d083af4
2 changed files with 12 additions and 6 deletions

View File

@ -33,6 +33,12 @@ else()
)
endif()
# index.theme is used by the lib (via qrc/rcc)
# and gets installed in the condition below
file(COPY_FILE index.theme.in index.theme)
file(READ ../commonthemeinfo.theme.in COMMON_THEME_INFO)
file(APPEND index.theme ${COMMON_THEME_INFO})
if(NOT SKIP_INSTALL_ICONS)
install(DIRECTORY ${breeze_icon_dark_dirs} DESTINATION ${BREEZE_INSTALL_DIR})
file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg")
@ -43,9 +49,6 @@ if(NOT SKIP_INSTALL_ICONS)
endif()
endforeach()
file(COPY_FILE index.theme.in index.theme)
file(READ ../commonthemeinfo.theme.in COMMON_THEME_INFO)
file(APPEND index.theme ${COMMON_THEME_INFO})
install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
if(NOT WIN32)

View File

@ -34,15 +34,18 @@ else()
)
endif()
# index.theme is used by the lib (via qrc/rcc)
# and gets installed in the condition below
file(COPY_FILE index.theme.in index.theme)
file(READ ../commonthemeinfo.theme.in COMMON_THEME_INFO)
file(APPEND index.theme ${COMMON_THEME_INFO})
if(NOT SKIP_INSTALL_ICONS)
install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR})
# collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too
file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg")
set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE)
file(COPY_FILE index.theme.in index.theme)
file(READ ../commonthemeinfo.theme.in COMMON_THEME_INFO)
file(APPEND index.theme ${COMMON_THEME_INFO})
install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
if(NOT WIN32)