summaryrefslogtreecommitdiffstats
path: root/CMakeScripts
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-06-25 16:15:05 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-06-25 16:15:05 +0000
commit5c2d982cc636ee4e2bc12703c01c86e245dd821f (patch)
tree6e6f22800c7d38314e14eccd486b65c3c4286d81 /CMakeScripts
parentupdate to trunk (diff)
parentFix for the bug 1468396 (diff)
downloadinkscape-5c2d982cc636ee4e2bc12703c01c86e245dd821f.tar.gz
inkscape-5c2d982cc636ee4e2bc12703c01c86e245dd821f.zip
update to trunk
(bzr r13645.1.94)
Diffstat (limited to 'CMakeScripts')
-rwxr-xr-xCMakeScripts/cmake_consistency_check.py2
-rw-r--r--CMakeScripts/cmake_consistency_check_config.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeScripts/cmake_consistency_check.py b/CMakeScripts/cmake_consistency_check.py
index 1e225d4ed..53026910e 100755
--- a/CMakeScripts/cmake_consistency_check.py
+++ b/CMakeScripts/cmake_consistency_check.py
@@ -87,7 +87,7 @@ def cmake_get_src(f):
sources_h = []
sources_c = []
- filen = open(f, "r", encoding="utf8")
+ filen = open(f, "r")
it = iter(filen)
found = False
i = 0
diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py
index 9b36cf297..8d73f9116 100644
--- a/CMakeScripts/cmake_consistency_check_config.py
+++ b/CMakeScripts/cmake_consistency_check_config.py
@@ -6,9 +6,12 @@ IGNORE = (
"/dom/work/",
"/extension/dbus/",
"/src/extension/dxf2svg/",
+ "/test/",
# files
"buildtool.cpp",
+ "src/inkscape-x64.rc",
+ "src/inkview-x64.rc",
"packaging/macosx/ScriptExec/main.c",
"share/ui/keybindings.rc",
"src/2geom/conic_section_clipper_impl.cpp",