From 7a4911590864f138550b63ff45dae65d92843bd6 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Mon, 17 Sep 2012 11:48:08 +0200 Subject: [PATCH 10/12] manually set cmake_install_prefix on the icon_install_dir when doing a cache update we apparently need the full path, which may be limited to this case, not quite sure. at any rate our code is vastly different from kdelibs' so a resync is out of the question for phonon4. would be good if one of the windows guys were to test this change. BUG: 294505 FIXED-IN: 4.6.1 --- cmake/PhononMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/PhononMacros.cmake b/cmake/PhononMacros.cmake index fc10180..9870a2c 100644 --- a/cmake/PhononMacros.cmake +++ b/cmake/PhononMacros.cmake @@ -96,8 +96,8 @@ macro (PHONON_UPDATE_ICONCACHE) install(CODE " set(DESTDIR_VALUE \"\$ENV{DESTDIR}\") if (NOT DESTDIR_VALUE) - file(WRITE \"${ICON_INSTALL_DIR}/hicolor/temp.txt\" \"update\") - file(REMOVE \"${ICON_INSTALL_DIR}/hicolor/temp.txt\") + file(WRITE \"${CMAKE_INSTALL_PREFIX}/${ICON_INSTALL_DIR}/hicolor/temp.txt\" \"update\") + file(REMOVE \"${CMAKE_INSTALL_PREFIX}/${ICON_INSTALL_DIR}/hicolor/temp.txt\") endif (NOT DESTDIR_VALUE) ") endmacro (PHONON_UPDATE_ICONCACHE) -- 1.8.3.1