diff options
| author | Christian Dywan <christian@twotoasts.de> | 2018-08-28 17:28:01 +0200 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2018-08-28 17:49:49 +0200 |
| commit | ce39b75bf680761e4c7867a228365d8fab883a27 (patch) | |
| tree | 43c703b471a5348bb3195d95bd30598d66e4c653 | |
| parent | fc7ef0d06a1d7a51c809af1080b8c85c1e3682a7 (diff) | |
| download | midori-git-absolute_icon_pathname.tar.gz | |
Use full pathname for Icon in .desktop for snapabsolute_icon_pathname
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 46076cf5..c5dfbe2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,8 @@ add_custom_target (uninstall install(FILES COPYING README DESTINATION ${CMAKE_INSTALL_DOCDIR}) +set(DESKTOP_ICON "${CMAKE_PROJECT_NAME}" CACHE STRING "The Icon value to be used in the .desktop file") + add_subdirectory (core) add_subdirectory (web) enable_testing() diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index b83a45b9..76124add 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -18,6 +18,13 @@ list(REMOVE_ITEM DATA_FILES "CMakeLists.txt") foreach(FILE ${DATA_FILES}) if (${FILE} MATCHES ".desktop") if (NOT WIN32) + FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} CONTENT) + # Escape CMake list-separator ";" first + string(REPLACE ";" "\\;" CONTENT "${CONTENT}") + string(REPLACE "Icon=${CMAKE_PROJECT_NAME}" + "Icon=${DESKTOP_ICON}" + CONTENT "${CONTENT}") + FILE(WRITE ${FILE} ${CONTENT}) string(REPLACE ".desktop.in" "" DESKTOP_ID ${FILE}) INTLTOOL_MERGE_DESKTOP (${DESKTOP_ID} po) endif () diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6e1316d2..f37a6bfe 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -62,6 +62,7 @@ parts: plugin: cmake configflags: - -DCMAKE_INSTALL_DATADIR=/usr/share + - -DDESKTOP_ICON=/usr/share/icons/hicolor/scalable/apps/midori.svg build-packages: - git - valac |