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') 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 30a0802e0a6ccbb37a76e816aa47ebf08e2b548d Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 13 Feb 2017 22:41:13 +0100 Subject: CMake: Cosmetic fix for version string (set concatenates arguments with a semicolon ";") (bzr r15517) --- CMakeScripts/inkscape-version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 11316101f..2e23925c4 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -22,7 +22,7 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") - set(INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM}) + set(INKSCAPE_REVISION "${INKSCAPE_REVISION} ${INKSCAPE_CUSTOM}") endif() endif() message("revision is " ${INKSCAPE_REVISION}) -- cgit v1.2.3 From 4def15d764671b9f1de73d5d7389264cb65eddb9 Mon Sep 17 00:00:00 2001 From: mathog <> Date: Fri, 17 Feb 2017 09:31:47 -0800 Subject: partial fix bug 1640899 (bzr r15527) --- CMakeScripts/DefineDependsandFlags.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index d66541604..90df50c6d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -85,19 +85,21 @@ if(WITH_GNOME_VFS) endif() if(ENABLE_LCMS) + unset(HAVE_LIBLCMS1) + unset(HAVE_LIBLCMS2) find_package(LCMS2) if(LCMS2_FOUND) list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES}) add_definitions(${LCMS2_DEFINITIONS}) - set (HAVE_LIBLCMS2 1) + set (HAVE_LIBLCMS2 ON) else() find_package(LCMS) if(LCMS_FOUND) list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES}) add_definitions(${LCMS_DEFINITIONS}) - set (HAVE_LIBLCMS1 1) + set (HAVE_LIBLCMS1 ON) else() set(ENABLE_LCMS OFF) endif() @@ -247,7 +249,7 @@ endif() # CMake's builtin # ---------------------------------------------------------------------------- -set(TRY_GTKSPELL 1) +set(TRY_GTKSPELL ON) # Include dependencies: # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added pkg_check_modules( @@ -270,14 +272,15 @@ set(TRY_GTKSPELL 1) if("${GTKMM_3_10_FOUND}") message("Using Gtkmm 3.10 build") - set (WITH_GTKMM_3_10 1) + set (WITH_GTKMM_3_10 ON) endif() pkg_check_modules(GDL_3_6 gdl-3.0>=3.6) if("${GDL_3_6_FOUND}") message("Using GDL 3.6 or higher") - set (WITH_GDL_3_6 1) + add_definitions(-DWITH_GDL_3_6) + set (WITH_GDL_3_6 ON) endif() set(TRY_GTKSPELL ) @@ -285,7 +288,7 @@ set(TRY_GTKSPELL 1) if("${GTKSPELL3_FOUND}") message("Using GtkSpell 3") - set (WITH_GTKSPELL 1) + set (WITH_GTKSPELL ON) else() unset(WITH_GTKSPELL) endif() -- 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') 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