From 026e9e2a388b7d58302f56d96bc4743cac194a94 Mon Sep 17 00:00:00 2001 From: Pandagrapher Date: Sat, 16 Mar 2024 16:13:47 +0100 Subject: [PATCH] Do not install 'index.theme' file for linux build with 'BUILD_BUNDLE=OFF' --- rtdata/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rtdata/CMakeLists.txt b/rtdata/CMakeLists.txt index e14862d7f..7ed0d95c7 100644 --- a/rtdata/CMakeLists.txt +++ b/rtdata/CMakeLists.txt @@ -24,7 +24,13 @@ endif() if(UNIX) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop" DESTINATION ${DESKTOPDIR}) - install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}") + if(BUILD_BUNDLE) + install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}") + else() + # For theme 'hicolor' (containing app icon), 'index.theme' shall not be installed for Linux build with 'BUILD_BUNDLE=OFF' option + # (to avoid conflict with existing 'index.theme' distro file) + install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}" PATTERN "index.theme" EXCLUDE) + endif() endif() install(FILES ${LANGUAGEFILES} DESTINATION "${DATADIR}/languages")