diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-01-24 23:17:27 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-01-24 23:17:27 +0000 |
| commit | de5309e28c48e1f4e1cd16ae69ab840677961ed1 (patch) | |
| tree | 926538e43f0503dffc03998af4ae0b9f218a55e5 | |
| parent | Tentatively fix build for lp packaging (diff) | |
| download | inkscape-de5309e28c48e1f4e1cd16ae69ab840677961ed1.tar.gz inkscape-de5309e28c48e1f4e1cd16ae69ab840677961ed1.zip | |
move install command to logical place
| -rw-r--r-- | share/icons/application/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | share/icons/hicolor/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/share/icons/application/CMakeLists.txt b/share/icons/application/CMakeLists.txt index 01f950474..c9913b2bc 100644 --- a/share/icons/application/CMakeLists.txt +++ b/share/icons/application/CMakeLists.txt @@ -4,7 +4,3 @@ foreach(pixmap_size ${PIXMAP_SIZES}) FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.svg) install(FILES ${PIXMAP_FILES} DESTINATION ${SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/apps) endforeach(pixmap_size) - -# I hope that this is actually run after installing the files. -install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_CURRENT_SOURCE_DIR})") -install(FILES icon-theme.cache DESTINATION ${SHARE_INSTALL}/icons/${THEME}) diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt index 141a2e581..8425d8b34 100644 --- a/share/icons/hicolor/CMakeLists.txt +++ b/share/icons/hicolor/CMakeLists.txt @@ -9,3 +9,6 @@ foreach(pixmap_size ${PIXMAP_SIZES}) install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content}) endforeach(content) endforeach(pixmap_size) + +install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_CURRENT_SOURCE_DIR})") +install(FILES icon-theme.cache DESTINATION ${SHARE_INSTALL}/icons/${THEME}) |