From 2479a36d9f59544f8b0978f1577ec8a7613c74be Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Thu, 2 Nov 2017 22:23:24 +0100 Subject: fix build --- CMakeScripts/HelperMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeScripts/HelperMacros.cmake b/CMakeScripts/HelperMacros.cmake index a0bdd9866..54bbf9d09 100644 --- a/CMakeScripts/HelperMacros.cmake +++ b/CMakeScripts/HelperMacros.cmake @@ -29,7 +29,7 @@ macro(add_inkscape_lib name sources) - add_library(${name} ${sources}) + add_library(${name} STATIC ${sources}) # works fine without having the includes # listed is helpful for IDE's (QtCreator/MSVC) -- cgit v1.2.3 From 073da60232635543fe12186d4fcb81a3da15f0f2 Mon Sep 17 00:00:00 2001 From: Simon Wells Date: Fri, 3 Nov 2017 12:25:58 +1300 Subject: change assignment to equality --- src/libnrtype/FontFactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 9c62e5483..90df81261 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -939,7 +939,7 @@ void font_factory::AddFontsDir(char const *utf8dir) conf = pango_fc_font_map_get_config(PANGO_FC_FONT_MAP(fontServer)); # endif FcBool res = FcConfigAppFontAddDir(conf, (FcChar8 const *)dir); - if (res = FcTrue) { + if (res == FcTrue) { g_info("Fonts dir '%s' added successfully.", utf8dir); } else { g_warning("Could not add fonts dir '%s'.", utf8dir); @@ -971,7 +971,7 @@ void font_factory::AddFontFile(char const *utf8file) conf = pango_fc_font_map_get_config(PANGO_FC_FONT_MAP(fontServer)); # endif FcBool res = FcConfigAppFontAddFile(conf, (FcChar8 const *)file); - if (res = FcTrue) { + if (res == FcTrue) { g_info("Font file '%s' added successfully.", utf8file); } else { g_warning("Could not add font file '%s'.", utf8file); -- cgit v1.2.3