From 4766622099da6d75250506f32a599c7abe8719dd Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 17 Jul 2018 10:19:06 +0200 Subject: [PATCH] feat(icons): deal with custom folders --- CMakeLists.txt | 11 +++++++++-- assets/icons/genicons.sh | 8 +++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d48ca23cf..754108c76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ set(TARGET_NAME linphone-qt) set(CMAKE_CXX_STANDARD 11) -set(ASSETS_DIR assets) +set(ASSETS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets") option(ENABLE_UPDATE_CHECK "Enable update check." NO) @@ -433,7 +433,14 @@ if (UNIX AND NOT APPLE) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications" ) - install(FILES "${ASSETS_DIR}/images/app_logo.svg" + + if (EXISTS "${ASSETS_DIR}/images/custom/app_logo.svg") + set(APP_LOGO_PATH "${ASSETS_DIR}/images/custom/app_logo.svg") + else () + set(APP_LOGO_PATH "${ASSETS_DIR}/images/app_logo.svg") + endif () + + install(FILES ${APP_LOGO_PATH} DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/" RENAME "${EXECUTABLE_NAME}.svg" ) diff --git a/assets/icons/genicons.sh b/assets/icons/genicons.sh index adf8df433..397bf7792 100755 --- a/assets/icons/genicons.sh +++ b/assets/icons/genicons.sh @@ -1,7 +1,13 @@ #!/usr/bin/env bash +if [ -f ../images/custom/app_logo.svg ] ; then + src=../images/custom/app_logo.svg +else + src=../images/app_logo.svg +fi + for i in 16 22 24 32 64 128 do mkdir -p hicolor/${i}x${i}/apps - inkscape -z -e hicolor/${i}x${i}/apps/icon.png -w $i -h $i ../images/app_logo.svg + inkscape -z -e hicolor/${i}x${i}/apps/icon.png -w $i -h $i $src done