diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-01-28 14:11:47 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-01-28 14:17:04 +0000 |
| commit | 842e44d5502627516e91f3c07a5bce3ebe6a2f2b (patch) | |
| tree | 803a9000be070f48a1fc467da572219ba4088a27 | |
| parent | Do not build icon cache for now (diff) | |
| download | inkscape-842e44d5502627516e91f3c07a5bce3ebe6a2f2b.tar.gz inkscape-842e44d5502627516e91f3c07a5bce3ebe6a2f2b.zip | |
Fix creation of icon-theme.cache
Escaping "${CMAKE_INSTALL_PREFIX}" with a backslash allows this to
work for the normal install target as well as with cpack (expansion
of the variable is delayed until installation where it has the
correct value).
Also make sure Adwaita's icon-theme.cache is up-to-date
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 1 | ||||
| -rw-r--r-- | share/icons/hicolor/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 6f66d5e26..395c98a2f 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -134,6 +134,7 @@ if(WIN32) install(DIRECTORY ${MINGW_PATH}/share/icons/Adwaita
DESTINATION share/icons)
+ install(CODE "execute_process(COMMAND gtk-update-icon-cache \${CMAKE_INSTALL_PREFIX}/share/icons/Adwaita)")
# translations for libraries (we usually shouldn't need many)
file(GLOB inkscape_translations RELATIVE ${CMAKE_SOURCE_DIR}/po/ ${CMAKE_SOURCE_DIR}/po/*.po)
diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt index 2a393d4ab..1e52c2dd8 100644 --- a/share/icons/hicolor/CMakeLists.txt +++ b/share/icons/hicolor/CMakeLists.txt @@ -10,7 +10,6 @@ foreach(pixmap_size ${PIXMAP_SIZES}) endforeach(content) endforeach(pixmap_size) -if(0) - install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})") - install(FILES ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/icon-theme.cache DESTINATION ${SHARE_INSTALL}/icons/${THEME}) +if(WIN32) + install(CODE "execute_process(COMMAND gtk-update-icon-cache \${CMAKE_INSTALL_PREFIX}/${INKSCAPE_SHARE_INSTALL}/icons/${THEME})") endif() |