From 0c9751c69184c11fea5f4f5e27074f1b21abb9da Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Thu, 9 Mar 2017 00:03:24 +0100
Subject: CMake: Prefer to install the genuine /hicolor/index.theme file in
 MSYS2 installs

This avoids the issues hiughlighted by su_v in
https://bugs.launchpad.net/inkscape/+bug/1659336/comments/5

(bzr r15581)
---
 CMakeScripts/InstallMSYS2.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 3cfc9c20c..63c6f0c4c 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -159,9 +159,10 @@ if(WIN32)
     PATTERN CMakeLists.txt EXCLUDE
     PATTERN *.am EXCLUDE)
 
-  # Generate a dummy file in hicolor/index.theme to avoid bug 1635207
-  file(GENERATE OUTPUT ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/index.theme
-    CONTENT "[Icon Theme]\nName=hicolor\nDirectories=")
+  # Install hicolor/index.theme to avoid bug 1635207
+  install(FILES
+    ${MINGW_PATH}/share/icons/hicolor/index.theme
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
 
   install(DIRECTORY ${MINGW_PATH}/share/icons/Adwaita
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons)
-- 
cgit v1.2.3