From e0a83507e07588b45c83c003bee116e4d74e0c5d Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 13 Feb 2017 20:34:06 +0100 Subject: CMake: Include GSettings schemas into Windows installation Fixes crash issue when trying to use GTK file dialogs (error: "GLib-GIO-ERROR **: No GSettings schemas are installed on the system") Fixed bugs: - https://launchpad.net/bugs/1663884 - https://launchpad.net/bugs/1663999 (bzr r15514) --- CMakeScripts/Install.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CMakeScripts/Install.cmake') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 01db2644c..fc82172e7 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -208,6 +208,9 @@ if(WIN32) install(DIRECTORY ${DEVLIBS_PATH}/share/poppler DESTINATION ${CMAKE_INSTALL_PREFIX}/share) + install(DIRECTORY ${DEVLIBS_PATH}/share/glib-2.0/schemas + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/glib-2.0) + install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) -- cgit v1.2.3 From 3e4fbb2d79bf7e1abb902112f9a54dc427f1a5a0 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 20 Feb 2017 22:21:18 +0100 Subject: CMake: Generate a dummy file in hicolor/index.theme to avoid bug 1659336 on Windows Fixed bugs: - https://launchpad.net/bugs/1659336 (bzr r15535) --- CMakeScripts/Install.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CMakeScripts/Install.cmake') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index fc82172e7..64ab4607b 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -195,6 +195,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(DIRECTORY ${DEVLIBS_PATH}/share/icons/Adwaita DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons) -- cgit v1.2.3