Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2020-11-04 19:43:45 +0300
committerHannah von Reth <hannah.vonreth@owncloud.com>2020-11-04 19:49:08 +0300
commit56361f9ed26bb4f9a701a3b819ed2a308346f255 (patch)
tree2dc394bcecd1760d9cb1fba4c2ffcf5bec620371 /src/crashreporter
parent9ba1a04be0325bc478696cd75883fba079a31b58 (diff)
Fix crashreport build with svg icon
Diffstat (limited to 'src/crashreporter')
-rw-r--r--src/crashreporter/CMakeLists.txt21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
index 9e1562652..b0fd2bf1c 100644
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -6,17 +6,22 @@
# endif()
# Theme
-if(DEFINED OEM_THEME_DIR AND EXISTS "${OEM_THEME_DIR}/theme/colored")
- set(CRASHREPORTER_ICON_DIR "${OEM_THEME_DIR}/theme/colored")
+set(CRASHREPORTER_ICON_DIR "${OEM_THEME_DIR}/theme/colored")
+
+set(CRASHREPORTER_ICON_FILENAME "${APPLICATION_ICON_NAME}-icon.svg")
+if (EXISTS "${OEM_THEME_DIR}/theme/colored/${CRASHREPORTER_ICON_FILENAME}")
+ set(CRASHREPORTER_ICON ":/${CRASHREPORTER_ICON_FILENAME}")
+ set(CRASHREPORTER_ICON_PATH "${CRASHREPORTER_ICON_DIR}/${CRASHREPORTER_ICON_FILENAME}")
else()
- set(CRASHREPORTER_ICON_DIR "${CMAKE_SOURCE_DIR}/theme/colored")
+ set(CRASHREPORTER_ICON_FILENAME "${APPLICATION_ICON_NAME}-icon.png")
+ set(CRASHREPORTER_ICON ":/${CRASHREPORTER_ICON_FILENAME}")
+ set(CRASHREPORTER_ICON_SIZE "128")
+ set(CRASHREPORTER_ICON_PATH "${CRASHREPORTER_ICON_DIR}/${CRASHREPORTER_ICON_SIZE}-${CRASHREPORTER_ICON_FILENAME}")
+ if (NOT EXISTS "${CRASHREPORTER_ICON_PATH}")
+ set(CRASHREPORTER_ICON_PATH "${CRASHREPORTER_ICON_DIR}/${APPLICATION_ICON_NAME}-icon-${CRASHREPORTER_ICON_SIZE}.png")
+ endif()
endif()
-set(CRASHREPORTER_ICON_FILENAME "${APPLICATION_ICON_NAME}-icon.png")
-set(CRASHREPORTER_ICON ":/${CRASHREPORTER_ICON_FILENAME}")
-set(CRASHREPORTER_ICON_SIZE "128")
-set(CRASHREPORTER_ICON_PATH "${CRASHREPORTER_ICON_DIR}/${CRASHREPORTER_ICON_SIZE}-${CRASHREPORTER_ICON_FILENAME}")
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources.qrc.in
${CMAKE_CURRENT_BINARY_DIR}/resources.qrc)